فهرست منبع

AMBARI-17907 On AMS collector move the webapp address does not change (zhewang)

Zhe (Joe) Wang 9 سال پیش
والد
کامیت
cab9ef7dcd

+ 9 - 10
ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -70,12 +70,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
 
   hostComponents: [],
 
-  /**
-   * List of components, that do not need reconfiguration for moving to another host
-   * Reconfigure command will be skipped
-   */
-  componentsWithoutReconfiguration: ['METRICS_COLLECTOR'],
-
   /**
    * Map with lists of related services.
    * Used to define list of services to stop/start.
@@ -194,6 +188,14 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
         }
       }
     },
+    {
+      componentName: 'METRICS_COLLECTOR',
+      configs: {
+        'ams-site': {
+          'timeline.metrics.service.webapp.address': '<replace-value>:6188'
+        }
+      }
+    },
     {
       componentName: 'HISTORYSERVER',
       configs: {
@@ -396,10 +398,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
       this.removeTasks(['startZooKeeperServers', 'startNameNode']);
     }
 
-    if (this.get('componentsWithoutReconfiguration').contains(componentName)) {
-      this.removeTasks(['reconfigure']);
-    }
-
     if (!this.get('content.reassignComponentsInMM.length')) {
       this.removeTasks(['stopHostComponentsInMaintenanceMode']);
     }
@@ -544,6 +542,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
     'HIVE_SERVER': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
     'HIVE_METASTORE': ['hive-site', 'webhcat-site', 'hive-env', 'core-site'],
     'MYSQL_SERVER': ['hive-site'],
+    'METRICS_COLLECTOR': ['ams-site'],
     'HISTORYSERVER': ['mapred-site']
   },
 

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

@@ -295,7 +295,7 @@ describe('App.ReassignMasterWizardStep4Controller', function () {
 
       controller.set('tasks', commandsForDB);
       controller.removeUnneededTasks();
-      expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,10,12]);
+      expect(controller.get('tasks').mapProperty('id')).to.eql([1,2,5,6,8,9,10,12]);
     });
 
     it('reassign component is Mysql Server', function () {