Repository: ambari Updated Branches: refs/heads/trunk 30899abc0 -> 754291661
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/75429166 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75429166 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75429166 Branch: refs/heads/trunk Commit: 7542916613ca2c900a89198b21266a37dfebc08f Parents: 30899ab Author: Myroslav Papirkovskyi <[email protected]> Authored: Thu May 26 17:08:52 2016 +0300 Committer: Myroslav Papirkovskyi <[email protected]> Committed: Thu May 26 17:10:07 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/75429166/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 5c9189c..4a843d8 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/75429166/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"
