Repository: ambari Updated Branches: refs/heads/trunk 4117e4bee -> 09f6e93f5
AMBARI-11690. Move Namenode hung at Configure Component step (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09f6e93f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09f6e93f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09f6e93f Branch: refs/heads/trunk Commit: 09f6e93f59847af3db424ea07eedaba2c98b0bc1 Parents: 4117e4b Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Thu Jun 4 17:42:09 2015 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Thu Jun 4 17:42:09 2015 +0300 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 3 +++ .../main/service/reassign/step4_controller_test.js | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/09f6e93f/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 fe547c3..edc9b8f 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -506,6 +506,9 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro if (App.Service.find().someProperty('serviceName', 'HBASE')) { urlParams.push('(type=hbase-site&tag=' + data.Clusters.desired_configs['hbase-site'].tag + ')'); } + if (App.Service.find().someProperty('serviceName', 'ACCUMULO')) { + urlParams.push('(type=accumulo-site&tag=' + data.Clusters.desired_configs['accumulo-site'].tag + ')'); + } break; case 'SECONDARY_NAMENODE': urlParams.push('(type=hdfs-site&tag=' + data.Clusters.desired_configs['hdfs-site'].tag + ')'); http://git-wip-us.apache.org/repos/asf/ambari/blob/09f6e93f/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 8e4e0d9..0713abf 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 @@ -511,7 +511,8 @@ describe('App.ReassignMasterWizardStep4Controller', function () { 'yarn-site': {tag: 5}, 'oozie-site': {tag: 6}, 'webhcat-site': {tag: 7}, - 'yarn-env': {tag: 8} + 'yarn-env': {tag: 8}, + 'accumulo-site': {tag: 9} } } }; @@ -544,6 +545,20 @@ describe('App.ReassignMasterWizardStep4Controller', function () { "(type=hbase-site&tag=3)" ]); }); + + it('get config of NAMENODE when ACCUMULO installed', function () { + services = [ + { + serviceName: 'ACCUMULO' + } + ]; + expect(controller.getConfigUrlParams('NAMENODE', data)).to.eql([ + "(type=hdfs-site&tag=1)", + "(type=core-site&tag=2)", + "(type=accumulo-site&tag=9)" + ]); + }); + }); describe('#onLoadConfigsTags()', function () {
