Repository: ambari Updated Branches: refs/heads/trunk 4d5d882db -> 6ebbddd05
AMBARI-7697. Oozie Server Migration option via Ambari Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ebbddd0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ebbddd0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ebbddd0 Branch: refs/heads/trunk Commit: 6ebbddd053e05ba893c7afa94474c839e33b4d46 Parents: 4d5d882 Author: Srimanth Gunturi <sgunt...@hortonworks.com> Authored: Thu Oct 9 16:53:02 2014 -0700 Committer: Srimanth Gunturi <sgunt...@hortonworks.com> Committed: Thu Oct 9 18:10:38 2014 -0700 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 11 ++++++++++- ambari-web/app/models/stack_service_component.js | 2 +- ambari-web/app/views/wizard/step5_view.js | 18 ++++++++++-------- .../service/reassign/step4_controller_test.js | 9 ++++++++- 4 files changed, 29 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6ebbddd0/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 823fdf7..bbd61d3 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -37,7 +37,8 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro unrelatedServicesMap: { 'JOBTRACKER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'], 'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'], - 'APP_TIMELINE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'] + 'APP_TIMELINE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'], + 'OOZIE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM', 'HIVE'] }, /** @@ -111,6 +112,14 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro } } }, + { + componentName: 'OOZIE_SERVER', + configs: { + 'oozie-site': { + 'oozie.base.url': '<replace-value>:11000/oozie' + } + } + } ], secureConfigsMap: [ http://git-wip-us.apache.org/repos/asf/ambari/blob/6ebbddd0/ambari-web/app/models/stack_service_component.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js index a8aa26c..5e9c2e9 100644 --- a/ambari-web/app/models/stack_service_component.js +++ b/ambari-web/app/models/stack_service_component.js @@ -77,7 +77,7 @@ App.StackServiceComponent = DS.Model.extend({ /** @property {Boolean} isReassignable - component supports reassign action **/ isReassignable: function() { - return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_SERVER'].contains(this.get('componentName')); + return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_SERVER', 'OOZIE_SERVER'].contains(this.get('componentName')); }.property('componentName'), /** @property {Boolean} isRollinRestartAllowed - component supports rolling restart action **/ http://git-wip-us.apache.org/repos/asf/ambari/blob/6ebbddd0/ambari-web/app/views/wizard/step5_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step5_view.js b/ambari-web/app/views/wizard/step5_view.js index 141a571..c65a462 100644 --- a/ambari-web/app/views/wizard/step5_view.js +++ b/ambari-web/app/views/wizard/step5_view.js @@ -42,14 +42,16 @@ App.WizardStep5View = Em.View.extend({ setCoHostedComponentText: function () { var coHostedComponents = App.StackServiceComponent.find().filterProperty('isOtherComponentCoHosted').filterProperty('stackService.isSelected'); var coHostedComponentsText = ''; - coHostedComponents.forEach(function (serviceComponent, index) { - var coHostedComponentsDisplayNames = serviceComponent.get('coHostedComponents').map(function (item) { - return App.StackServiceComponent.find().findProperty('componentName', item).get('displayName'); - }); - var componentTextArr = [serviceComponent.get('displayName')].concat(coHostedComponentsDisplayNames); - coHostedComponents[index] = stringUtils.getFormattedStringFromArray(componentTextArr); - coHostedComponentsText += '<br/>' + Em.I18n.t('installer.step5.body.coHostedComponents').format(coHostedComponents[index]); - }, this); + if (!this.get('controller').get('isReassignWizard')) { + coHostedComponents.forEach(function (serviceComponent, index) { + var coHostedComponentsDisplayNames = serviceComponent.get('coHostedComponents').map(function (item) { + return App.StackServiceComponent.find().findProperty('componentName', item).get('displayName'); + }); + var componentTextArr = [serviceComponent.get('displayName')].concat(coHostedComponentsDisplayNames); + coHostedComponents[index] = stringUtils.getFormattedStringFromArray(componentTextArr); + coHostedComponentsText += '<br/>' + Em.I18n.t('installer.step5.body.coHostedComponents').format(coHostedComponents[index]); + }, this); + } this.set('coHostedComponentText', coHostedComponentsText); } http://git-wip-us.apache.org/repos/asf/ambari/blob/6ebbddd0/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 c0248af..baee572 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 @@ -475,6 +475,12 @@ describe('App.ReassignMasterWizardStep4Controller', function () { result: [ "(type=yarn-site&tag=5)" ] + }, + { + componentName: 'OOZIE_SERVER', + result: [ + "(type=oozie-site&tag=6)" + ] } ]; @@ -485,7 +491,8 @@ describe('App.ReassignMasterWizardStep4Controller', function () { 'core-site': {tag: 2}, 'hbase-site': {tag: 3}, 'mapred-site': {tag: 4}, - 'yarn-site': {tag: 5} + 'yarn-site': {tag: 5}, + 'oozie-site': {tag: 6} } } };
