Browse Source

AMBARI-3396 UI optimization: modify parameters of service mapper request. (atkach)

atkach 11 years ago
parent
commit
94a17ec4a6
1 changed files with 9 additions and 3 deletions
  1. 9 3
      ambari-web/app/controllers/global/update_controller.js

+ 9 - 3
ambari-web/app/controllers/global/update_controller.js

@@ -81,6 +81,7 @@ App.UpdateController = Em.Controller.extend({
     self.set('isUpdated', false);
     self.set('isUpdated', false);
 
 
     var conditionalFields = [];
     var conditionalFields = [];
+    var initialFields = ['components/host_components/HostRoles/state'];
     var services = [
     var services = [
         {
         {
             name: 'FLUME',
             name: 'FLUME',
@@ -96,11 +97,15 @@ App.UpdateController = Em.Controller.extend({
             conditionalFields.push("components/host_components/metrics/" + service.urlParam);
             conditionalFields.push("components/host_components/metrics/" + service.urlParam);
         }
         }
     });
     });
+    if(App.supports.hostOverrides) {
+      conditionalFields.push('components/host_components/HostRoles/actual_configs');
+    }
     var conditionalFieldsString = conditionalFields.length > 0 ? ',' + conditionalFields.join(',') : '';
     var conditionalFieldsString = conditionalFields.length > 0 ? ',' + conditionalFields.join(',') : '';
+    var initialFieldsString = initialFields.length > 0 ? ',' + initialFields.join(',') : '';
     var methodStartTs = new Date().getTime();
     var methodStartTs = new Date().getTime();
     var testUrl = App.get('isHadoop2Stack') ? '/data/dashboard/HDP2/services.json':'/data/dashboard/services.json';
     var testUrl = App.get('isHadoop2Stack') ? '/data/dashboard/HDP2/services.json':'/data/dashboard/services.json';
 
 
-    var realUrl = '/services?fields=components/ServiceComponentInfo,components/host_components,components/host_components/HostRoles,' +
+    var realUrl = '/services?fields=components/ServiceComponentInfo,' +
       'components/host_components/metrics/jvm/memHeapUsedM,' +
       'components/host_components/metrics/jvm/memHeapUsedM,' +
       'components/host_components/metrics/jvm/memHeapCommittedM,' +
       'components/host_components/metrics/jvm/memHeapCommittedM,' +
       'components/host_components/metrics/mapred/jobtracker/trackers_decommissioned,' +
       'components/host_components/metrics/mapred/jobtracker/trackers_decommissioned,' +
@@ -121,9 +126,10 @@ App.UpdateController = Em.Controller.extend({
       'components/host_components/metrics/dfs/namenode/TotalFiles,' +
       'components/host_components/metrics/dfs/namenode/TotalFiles,' +
       'components/host_components/metrics/dfs/namenode/UpgradeFinalized,' +
       'components/host_components/metrics/dfs/namenode/UpgradeFinalized,' +
       'components/host_components/metrics/dfs/namenode/Safemode,' +
       'components/host_components/metrics/dfs/namenode/Safemode,' +
-      'components/host_components/metrics/runtime/StartTime';
+      'components/host_components/metrics/runtime/StartTime' +
+      conditionalFieldsString;
 
 
-    var servicesUrl = isInitialLoad ? this.getUrl(testUrl, realUrl + conditionalFieldsString) : this.getUrl(testUrl, realUrl + conditionalFieldsString);
+    var servicesUrl = isInitialLoad ? this.getUrl(testUrl, realUrl + initialFieldsString) : this.getUrl(testUrl, realUrl);
     var callback = callback || function (jqXHR, textStatus) {
     var callback = callback || function (jqXHR, textStatus) {
       self.set('isUpdated', true);
       self.set('isUpdated', true);
     };
     };