Repository: ambari Updated Branches: refs/heads/trunk 0f23e3d8c -> 173a54efe
AMBARI-4820. Modifying Tez configs does not turn on restart indicator. (Nate Cole via mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/173a54ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/173a54ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/173a54ef Branch: refs/heads/trunk Commit: 173a54efe8a8ce283a497ba8e67ee95a28b4fc9c Parents: 0f23e3d Author: Mahadev Konar <[email protected]> Authored: Sun Mar 2 10:54:12 2014 -0800 Committer: Mahadev Konar <[email protected]> Committed: Sun Mar 2 10:54:12 2014 -0800 ---------------------------------------------------------------------- .../src/main/python/ambari_agent/LiveStatus.py | 27 ++++++++++++++++++-- .../test/python/ambari_agent/TestLiveStatus.py | 4 +++ 2 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/173a54ef/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 c95b96d..6f9f4db 100644 --- a/ambari-agent/src/main/python/ambari_agent/LiveStatus.py +++ b/ambari-agent/src/main/python/ambari_agent/LiveStatus.py @@ -33,7 +33,8 @@ class LiveStatus: "HDFS", "MAPREDUCE", "GANGLIA", "HBASE", "NAGIOS", "ZOOKEEPER", "OOZIE", "HCATALOG", "KERBEROS", "TEMPLETON", "HIVE", "WEBHCAT", - "YARN", "MAPREDUCE2", "FLUME" + "YARN", "MAPREDUCE2", "FLUME", "TEZ", + "FALCON", "STORM" ] CLIENT_COMPONENTS = [ @@ -58,7 +59,11 @@ class LiveStatus: {"serviceName" : "PIG", "componentName" : "PIG"}, {"serviceName" : "SQOOP", - "componentName" : "SQOOP"} + "componentName" : "SQOOP"}, + {"serviceName" : "TEZ", + "componentName" : "TEZ_CLIENT"}, + {"serviceName" : "FALCON", + "componentName" : "FALCON_CLIENT"} ] COMPONENTS = [ @@ -120,9 +125,27 @@ class LiveStatus: "componentName" : "RESOURCEMANAGER"}, {"serviceName" : "YARN", "componentName" : "NODEMANAGER"}, + {"serviceName" : "YARN", + "componentName" : "APP_TIMELINE_SERVER"}, {"serviceName" : "MAPREDUCE2", "componentName" : "HISTORYSERVER"}, + + {"serviceName" : "FALCON", + "componentName" : "FALCON_SERVER"}, + + {"serviceName" : "STORM", + "componentName" : "NIMBUS"}, + {"serviceName" : "STORM", + "componentName" : "STORM_REST_API"}, + {"serviceName" : "STORM", + "componentName" : "SUPERVISOR"}, + {"serviceName" : "STORM", + "componentName" : "STORM_UI_SERVER"}, + {"serviceName" : "STORM", + "componentName" : "DRPC_SERVER"}, + {"serviceName" : "STORM", + "componentName" : "LOGVIEWER_SERVER"} ] LIVE_STATUS = "STARTED" http://git-wip-us.apache.org/repos/asf/ambari/blob/173a54ef/ambari-agent/src/test/python/ambari_agent/TestLiveStatus.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/ambari_agent/TestLiveStatus.py b/ambari-agent/src/test/python/ambari_agent/TestLiveStatus.py index 4266236..96a21b9 100644 --- a/ambari-agent/src/test/python/ambari_agent/TestLiveStatus.py +++ b/ambari-agent/src/test/python/ambari_agent/TestLiveStatus.py @@ -73,6 +73,10 @@ class TestLiveStatus(TestCase): self.assertTrue(len(result) > 0, 'Livestatus should not be empty') self.assertTrue(result['status'], LiveStatus.DEAD_STATUS) + livestatus = LiveStatus('c1', 'TEZ', 'TEZ_CLIENT', { }, config) + result = livestatus.build(forsed_component_status = LiveStatus.LIVE_STATUS) + self.assertTrue(len(result) > 0, 'Livestatus should not be empty') + self.assertTrue(result['status'], LiveStatus.LIVE_STATUS) @patch.object(ActualConfigHandler.ActualConfigHandler, "read_actual_component") @patch.object(StatusCheck.StatusCheck, "getStatus")
