Repository: ambari Updated Branches: refs/heads/branch-2.4 5b6fbb4d9 -> cab9ef7dc
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/cab9ef7d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cab9ef7d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cab9ef7d Branch: refs/heads/branch-2.4 Commit: cab9ef7dcd0626be17d57c5317b6ba1a70d4f55f Parents: 5b6fbb4 Author: Zhe (Joe) Wang <[email protected]> Authored: Wed Jul 27 11:16:02 2016 -0700 Committer: Zhe (Joe) Wang <[email protected]> Committed: Wed Jul 27 11:17:04 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/cab9ef7d/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/cab9ef7d/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 () {
