Repository: ambari Updated Branches: refs/heads/trunk e0ee513d3 -> 78c2de2c2
AMBARI-9977. Could not enable RM HA (RM start is failed) after Ambari only upgrade from 1.6.0 to 2.0.0 and enabling NN HA (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78c2de2c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78c2de2c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78c2de2c Branch: refs/heads/trunk Commit: 78c2de2c203e2a8d65cb60186cc9e44867bdcef9 Parents: e0ee513 Author: Alex Antonenko <[email protected]> Authored: Sun Mar 8 11:00:57 2015 +0200 Committer: Alex Antonenko <[email protected]> Committed: Sun Mar 8 13:10:08 2015 +0200 ---------------------------------------------------------------------- .../admin/highAvailability/resourceManager/step3_controller.js | 2 +- .../highAvailability/resourceManager/step3_controller_test.js | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/78c2de2c/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js index f97bd07..73eca17 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js @@ -118,7 +118,7 @@ App.RMHighAvailabilityWizardStep3Controller = Em.Controller.extend({ currentRMHost = this.get('content.rmHosts.currentRM'), additionalRMHost = this.get('content.rmHosts.additionalRM'), zooKeeperHostsWithPort = App.HostComponent.find().filterProperty('componentName', 'ZOOKEEPER_SERVER').map(function (item) { - return item.get('host.hostName') + ':' + zkPort; + return item.get('hostName') + ':' + zkPort; }).join(','); configProperties.findProperty('name', 'yarn.resourcemanager.hostname.rm1').set('value', currentRMHost).set('defaultValue', currentRMHost); http://git-wip-us.apache.org/repos/asf/ambari/blob/78c2de2c/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js b/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js index b85d665..21416d6 100644 --- a/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js +++ b/ambari-web/test/controllers/main/admin/highAvailability/resourceManager/step3_controller_test.js @@ -246,21 +246,15 @@ describe('App.RMHighAvailabilityWizardStep3Controller', function () { return [ Em.Object.create({ componentName: 'ZOOKEEPER_SERVER', - host: { hostName: 'h2' - } }), Em.Object.create({ componentName: 'ZOOKEEPER_SERVER', - host: { hostName: 'h3' - } }), Em.Object.create({ componentName: 'RESOURCEMANAGER', - host: { hostName: 'h4' - } }) ]; });
