You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2015/09/11 02:18:55 UTC
ambari git commit: AMBARI-13067. Kafka: Add Service Action options
for Rolling Restart and Rolling Stop. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 8de1efcab -> 067d4ee73
AMBARI-13067. Kafka: Add Service Action options for Rolling Restart and Rolling Stop. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/067d4ee7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/067d4ee7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/067d4ee7
Branch: refs/heads/trunk
Commit: 067d4ee73498113ab0588c087c9950f91920ba55
Parents: 8de1efc
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Sep 10 17:16:51 2015 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Sep 10 17:16:51 2015 -0700
----------------------------------------------------------------------
ambari-web/app/models/stack_service_component.js | 2 +-
ambari-web/app/views/main/service/item.js | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/067d4ee7/ambari-web/app/models/stack_service_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_service_component.js b/ambari-web/app/models/stack_service_component.js
index a763c1e..32df014 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -82,7 +82,7 @@ App.StackServiceComponent = DS.Model.extend({
/** @property {Boolean} isRollinRestartAllowed - component supports rolling restart action **/
isRollinRestartAllowed: function() {
- return this.get('isSlave');
+ return this.get('isSlave') || this.get('componentName') === 'KAFKA_BROKER';
}.property('componentName'),
/** @property {Boolean} isDecommissionAllowed - component supports decommission action **/
http://git-wip-us.apache.org/repos/asf/ambari/blob/067d4ee7/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index ec4836e..d141229 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -140,12 +140,12 @@ App.MainServiceItemView = Em.View.extend({
options.push(actionMap.REFRESHQUEUES);
}
options.push(actionMap.RESTART_ALL);
- allSlaves.filter(function (slave) {
- return App.get('components.rollinRestartAllowed').contains(slave);
- }).forEach(function(slave) {
+ allSlaves.concat(allMasters).filter(function (_component) {
+ return App.get('components.rollinRestartAllowed').contains(_component);
+ }).forEach(function(_component) {
options.push(self.createOption(actionMap.ROLLING_RESTART, {
- context: slave,
- label: actionMap.ROLLING_RESTART.label.format(App.format.role(slave))
+ context: _component,
+ label: actionMap.ROLLING_RESTART.label.format(App.format.role(_component))
}));
});
allMasters.filter(function(master) {