You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2016/06/02 16:18:24 UTC
[3/5] ambari git commit: AMBARI-16898. Restart icon appears
incorrectly for client components. (mpapirkovskyy)
AMBARI-16898. Restart icon appears incorrectly for client components. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a52b57c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a52b57c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a52b57c1
Branch: refs/heads/branch-2.4
Commit: a52b57c1cd6c8c7825d3d8635bbbeef42f8947ec
Parents: e42a0f3
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Thu May 26 17:08:52 2016 +0300
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Thu Jun 2 19:16:05 2016 +0300
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 2 ++
ambari-agent/src/main/python/ambari_agent/LiveStatus.py | 5 +++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a52b57c1/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index abb567a..fdda632 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -411,8 +411,10 @@ class ActionQueue(threading.Thread):
if command.has_key('configurationTags'):
configHandler.write_actual(command['configurationTags'])
roleResult['configurationTags'] = command['configurationTags']
+ component = {'serviceName':command['serviceName'],'componentName':command['role']}
if 'roleCommand' in command and \
(command['roleCommand'] == self.ROLE_COMMAND_START or
+ (command['roleCommand'] == self.ROLE_COMMAND_INSTALL and component in LiveStatus.CLIENT_COMPONENTS) or
(command['roleCommand'] == self.ROLE_COMMAND_CUSTOM_COMMAND and
'custom_command' in command['hostLevelParams'] and
command['hostLevelParams']['custom_command'] == self.CUSTOM_COMMAND_RESTART)):
http://git-wip-us.apache.org/repos/asf/ambari/blob/a52b57c1/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/LiveStatus.py b/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
index 242fab9..b6d54ed 100644
--- a/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
+++ b/ambari-agent/src/main/python/ambari_agent/LiveStatus.py
@@ -25,6 +25,11 @@ logger = logging.getLogger()
class LiveStatus:
+
+ SERVICES = []
+ CLIENT_COMPONENTS = []
+ COMPONENTS = []
+
LIVE_STATUS = "STARTED"
DEAD_STATUS = "INSTALLED"