You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/10/03 01:37:42 UTC
git commit: Revert "AMBARI-3396 UI optimization: modify parameters of
service mapper request. (atkach)"
Updated Branches:
refs/heads/trunk f5a8f99ed -> 83d03436a
Revert "AMBARI-3396 UI optimization: modify parameters of service mapper request. (atkach)"
This reverts commit 62b1902eb2362d9672c7e25fe94bb81c90487311.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/83d03436
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/83d03436
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/83d03436
Branch: refs/heads/trunk
Commit: 83d03436af22ac68321c1d5077d18e2400d09ddd
Parents: f5a8f99
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Wed Oct 2 16:22:14 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Wed Oct 2 16:22:14 2013 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/global/update_controller.js | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/83d03436/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 9fc1471..425a24b 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -81,7 +81,6 @@ App.UpdateController = Em.Controller.extend({
self.set('isUpdated', false);
var conditionalFields = [];
- var initialFields = ['components/host_components/HostRoles/state'];
var services = [
{
name: 'FLUME',
@@ -97,15 +96,11 @@ App.UpdateController = Em.Controller.extend({
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 initialFieldsString = initialFields.length > 0 ? ',' + initialFields.join(',') : '';
var methodStartTs = new Date().getTime();
var testUrl = App.get('isHadoop2Stack') ? '/data/dashboard/HDP2/services.json':'/data/dashboard/services.json';
- var realUrl = '/services?fields=' +
+ var realUrl = '/services?fields=components/ServiceComponentInfo,components/host_components,components/host_components/HostRoles,' +
'components/host_components/metrics/jvm/memHeapUsedM,' +
'components/host_components/metrics/jvm/memHeapCommittedM,' +
'components/host_components/metrics/mapred/jobtracker/trackers_decommissioned,' +
@@ -126,10 +121,9 @@ App.UpdateController = Em.Controller.extend({
'components/host_components/metrics/dfs/namenode/TotalFiles,' +
'components/host_components/metrics/dfs/namenode/UpgradeFinalized,' +
'components/host_components/metrics/dfs/namenode/Safemode,' +
- 'components/host_components/metrics/runtime/StartTime' +
- conditionalFieldsString;
+ 'components/host_components/metrics/runtime/StartTime';
- var servicesUrl = isInitialLoad ? this.getUrl(testUrl, realUrl + initialFieldsString) : this.getUrl(testUrl, realUrl);
+ var servicesUrl = isInitialLoad ? this.getUrl(testUrl, realUrl + conditionalFieldsString) : this.getUrl(testUrl, realUrl + conditionalFieldsString);
var callback = callback || function (jqXHR, textStatus) {
self.set('isUpdated', true);
};