You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/10/02 23:12:23 UTC
[19/32] ambari git commit: AMBARI-12328 Background operations popup
window does not use service display name for restart operations. (Sangeeta
Ravindran via ababiichuk)
AMBARI-12328 Background operations popup window does not use service display name for restart operations. (Sangeeta Ravindran via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13ffc4d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13ffc4d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13ffc4d2
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 13ffc4d203f1695b2119fddd9f2d7a12aabd0db4
Parents: 13dc76c
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Oct 2 10:08:41 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Oct 2 10:08:41 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 4 ++--
ambari-web/app/controllers/main/service/item.js | 4 ++--
ambari-web/app/utils/batch_scheduled_requests.js | 5 +++--
ambari-web/app/views/main/service/info/summary.js | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/13ffc4d2/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 3252fa3..947254a 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -625,13 +625,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
App.router.get('mainServiceItemController').checkNnLastCheckpointTime(function () {
return App.showConfirmationFeedBackPopup(function (query) {
var selectedService = self.get('content.id');
- batchUtils.restartAllServiceHostComponents(selectedService, true, query);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, selectedService, true, query);
}, bodyMessage);
});
} else {
return App.showConfirmationFeedBackPopup(function (query) {
var selectedService = self.get('content.id');
- batchUtils.restartAllServiceHostComponents(selectedService, true, query);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, selectedService, true, query);
}, bodyMessage);
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/13ffc4d2/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 89f44ac..cb8b493 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -613,12 +613,12 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
this.get('content.hostComponents').filterProperty('componentName', 'NAMENODE').someProperty('workStatus', App.HostComponentStatus.started)) {
this.checkNnLastCheckpointTime(function () {
return App.showConfirmationFeedBackPopup(function(query, runMmOperation) {
- batchUtils.restartAllServiceHostComponents(serviceName, false, query, runMmOperation);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, serviceName, false, query, runMmOperation);
}, bodyMessage);
});
} else {
return App.showConfirmationFeedBackPopup(function(query, runMmOperation) {
- batchUtils.restartAllServiceHostComponents(serviceName, false, query, runMmOperation);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, serviceName, false, query, runMmOperation);
}, bodyMessage);
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/13ffc4d2/ambari-web/app/utils/batch_scheduled_requests.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/batch_scheduled_requests.js b/ambari-web/app/utils/batch_scheduled_requests.js
index 95d8f9b..ca0972e 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -65,14 +65,15 @@ module.exports = {
/**
* Facade-function for restarting host components of specific service
+ * @param {String} serviceDisplayName for which service hostComponents should be restarted
* @param {String} serviceName for which service hostComponents should be restarted
* @param {bool} staleConfigsOnly restart only hostComponents with <code>staleConfig</code> true
* @param {Object} query
* @param {bool} runMmOperation
*/
- restartAllServiceHostComponents: function(serviceName, staleConfigsOnly, query, runMmOperation) {
+ restartAllServiceHostComponents: function(serviceDisplayName, serviceName, staleConfigsOnly, query, runMmOperation) {
var self = this;
- var context = staleConfigsOnly ? Em.I18n.t('rollingrestart.context.allWithStaleConfigsForSelectedService').format(serviceName) : Em.I18n.t('rollingrestart.context.allForSelectedService').format(serviceName);
+ var context = staleConfigsOnly ? Em.I18n.t('rollingrestart.context.allWithStaleConfigsForSelectedService').format(serviceDisplayName) : Em.I18n.t('rollingrestart.context.allForSelectedService').format(serviceDisplayName);
if (runMmOperation) {
this.turnOnOffPassiveRequest('ON', Em.I18n.t('passiveState.turnOnFor').format(serviceName), serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/13ffc4d2/ambari-web/app/views/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js
index 78855c0..6a5d801 100644
--- a/ambari-web/app/views/main/service/info/summary.js
+++ b/ambari-web/app/views/main/service/info/summary.js
@@ -348,13 +348,13 @@ App.MainServiceInfoSummaryView = Em.View.extend(App.UserPref, {
App.router.get('mainServiceItemController').checkNnLastCheckpointTime(function () {
return App.showConfirmationFeedBackPopup(function (query) {
var selectedService = self.get('service.id');
- batchUtils.restartAllServiceHostComponents(selectedService, true, query);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, selectedService, true, query);
}, bodyMessage);
});
} else {
return App.showConfirmationFeedBackPopup(function (query) {
var selectedService = self.get('service.id');
- batchUtils.restartAllServiceHostComponents(selectedService, true, query);
+ batchUtils.restartAllServiceHostComponents(serviceDisplayName, selectedService, true, query);
}, bodyMessage);
}
},