ソースを参照

AMBARI-7668. ATS Migration Option Via Ambari

Srimanth Gunturi 10 年 前
コミット
eb8f23d2c4

+ 1 - 1
ambari-web/app/controllers/main/service/reassign/step2_controller.js

@@ -71,7 +71,7 @@ App.ReassignMasterWizardStep2Controller = App.WizardStep5Controller.extend({
         selectedHost: master.hostName,
         isInstalled: true,
         serviceId: App.HostComponent.find().findProperty('componentName', master.component).get('serviceName'),
-        isServiceCoHost: ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(master.component),
+        isServiceCoHost: ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(master.component) && !this.get('this.isReassignWizard'),
         color: color
       });
     }, this);

+ 22 - 2
ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -36,7 +36,8 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
    */
   unrelatedServicesMap: {
     'JOBTRACKER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
-    'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM']
+    'RESOURCEMANAGER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM'],
+    'APP_TIMELINE_SERVER': ['HDFS', 'ZOOKEEPER', 'HBASE', 'FLUME', 'SQOOP', 'STORM']
   },
 
   /**
@@ -99,7 +100,17 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
           'fs.defaultFS': 'hdfs://<replace-value>:8020'
         }
       }
-    }
+    },
+    {
+      componentName: 'APP_TIMELINE_SERVER',
+      configs: {
+        'yarn-site': {
+          'yarn.timeline-service.webapp.address': '<replace-value>:8188',
+          'yarn.timeline-service.webapp.https.address': '<replace-value>:8190',
+          'yarn.timeline-service.address': '<replace-value>:10200'
+        }
+      }
+    },
   ],
 
   secureConfigsMap: [
@@ -383,6 +394,15 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
       case 'RESOURCEMANAGER':
         urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
         break;
+      case 'WEBHCAT_SERVER':
+        urlParams.push('(type=webhcat-site&tag=' + data.Clusters.desired_configs['webhcat-site'].tag + ')');
+        break;
+      case 'APP_TIMELINE_SERVER':
+        urlParams.push('(type=yarn-site&tag=' + data.Clusters.desired_configs['yarn-site'].tag + ')');
+        break;
+      case 'OOZIE_SERVER':
+        urlParams.push('(type=oozie-site&tag=' + data.Clusters.desired_configs['oozie-site'].tag + ')');
+        break;
     }
     return urlParams;
   },

+ 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'].contains(this.get('componentName'));
+    return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 'APP_TIMELINE_SERVER'].contains(this.get('componentName'));
   }.property('componentName'),
 
   /** @property {Boolean} isRollinRestartAllowed - component supports rolling restart action **/

+ 6 - 0
ambari-web/test/controllers/main/service/reassign/step4_controller_test.js

@@ -469,6 +469,12 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
         result: [
           "(type=yarn-site&tag=5)"
         ]
+      },
+      {
+        componentName: 'APP_TIMELINE_SERVER',
+        result: [
+          "(type=yarn-site&tag=5)"
+        ]
       }
     ];
 

+ 1 - 1
ambari-web/test/models/stack_service_component_test.js

@@ -122,7 +122,7 @@ var componentPropertiesValidationTests = [
       isSlave: false,
       isMaster: true,
       isRestartable: true,
-      isReassignable: false,
+      isReassignable: true,
       isDeletable: false,
       isRollinRestartAllowed: false,
       isDecommissionAllowed: false,