Ver código fonte

AMBARI-7697. Oozie Server Migration option via Ambari

Srimanth Gunturi 10 anos atrás
pai
commit
6ebbddd053

+ 10 - 1
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: [

+ 1 - 1
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 **/

+ 10 - 8
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);
   }

+ 8 - 1
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}
         }
       }
     };