You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by zh...@apache.org on 2016/07/27 18:16:20 UTC
ambari git commit: AMBARI-17907 On AMS collector move the webapp
address does not change (zhewang)
Repository: ambari
Updated Branches:
refs/heads/trunk 55b958224 -> e7c31f7b0
AMBARI-17907 On AMS collector move the webapp address does not change (zhewang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7c31f7b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7c31f7b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7c31f7b
Branch: refs/heads/trunk
Commit: e7c31f7b0f362c8b70c27c05e688061ae7f341b2
Parents: 55b9582
Author: Zhe (Joe) Wang <zh...@apache.org>
Authored: Wed Jul 27 11:16:02 2016 -0700
Committer: Zhe (Joe) Wang <zh...@apache.org>
Committed: Wed Jul 27 11:16:02 2016 -0700
----------------------------------------------------------------------
.../main/service/reassign/step4_controller.js | 19 +++++++++----------
.../service/reassign/step4_controller_test.js | 2 +-
2 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7c31f7b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index d8f0394..db7028f 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -71,12 +71,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
hostComponents: [],
/**
- * List of components, that do not need reconfiguration for moving to another host
- * Reconfigure command will be skipped
- */
- componentsWithoutReconfiguration: ['METRICS_COLLECTOR'],
-
- /**
* Map with lists of related services.
* Used to define list of services to stop/start.
*/
@@ -195,6 +189,14 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
}
},
{
+ componentName: 'METRICS_COLLECTOR',
+ configs: {
+ 'ams-site': {
+ 'timeline.metrics.service.webapp.address': '<replace-value>:6188'
+ }
+ }
+ },
+ {
componentName: 'HISTORYSERVER',
configs: {
'mapred-site': {
@@ -396,10 +398,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
this.removeTasks(['startZooKeeperServers', 'startNameNode']);
}
- if (this.get('componentsWithoutReconfiguration').contains(componentName)) {
- this.removeTasks(['reconfigure']);
- }
-
if (!this.get('content.reassignComponentsInMM.length')) {
this.removeTasks(['stopHostComponentsInMaintenanceMode']);
}
@@ -544,6 +542,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
'HIVE_SERVER': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
'MYSQL_SERVER': ['hive-site'],
+ 'METRICS_COLLECTOR': ['ams-site'],
'HISTORYSERVER': ['mapred-site']
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e7c31f7b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index d6ef9dc..cbf47e0 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -295,7 +295,7 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
controller.set('tasks', commandsForDB);
controller.removeUnneededTasks();
- expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,10,12]);
+ expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,9,10,12]);
});
it('reassign component is Mysql Server', function () {