Updated Branches: refs/heads/trunk a8309ce09 -> 8e836f1b8
AMBARI-3638. Reassign Master (secure setup) : RM reassignment should not have NN and ZK servers start command. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/8e836f1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/8e836f1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/8e836f1b Branch: refs/heads/trunk Commit: 8e836f1b82522a5c084c6307cc862f969497026a Parents: a8309ce Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Oct 31 17:48:18 2013 +0200 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Oct 31 17:48:18 2013 +0200 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 7 ++++--- .../controllers/main/service/reassign_controller_test.js | 11 ----------- 2 files changed, 4 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8e836f1b/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 bcd2461..6134086 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -69,10 +69,11 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro } if (this.get('content.hasManualSteps')) { - if (App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) { - this.get('tasks').splice(5, 4); - } else { + if (this.get('content.reassign.component_name') === 'NAMENODE' && !App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) { + // Only for reassign NameNode with HA enabled this.get('tasks').splice(7, 2); + } else { + this.get('tasks').splice(5, 4); } } else { this.get('tasks').splice(5, 2); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8e836f1b/ambari-web/test/controllers/main/service/reassign_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/reassign_controller_test.js b/ambari-web/test/controllers/main/service/reassign_controller_test.js index 3d3401b..484ac83 100644 --- a/ambari-web/test/controllers/main/service/reassign_controller_test.js +++ b/ambari-web/test/controllers/main/service/reassign_controller_test.js @@ -33,15 +33,4 @@ describe('App.ReassignMasterController', function () { reassignMasterController.set('content.reassign', {service_id:null}); - describe('#skipStep3', function() { - it('should be TRUE for GANGLIA', function() { - reassignMasterController.set('content.reassign.service_id', 'GANGLIA'); - expect(reassignMasterController.get('skipStep3')).to.equal(true); - }); - it('should be FALSE for others', function() { - reassignMasterController.set('content.reassign.service_id', 'HDFS'); - expect(reassignMasterController.get('skipStep3')).to.equal(false); - }); - }); - });
