[incubator-heron] branch huijunw/healthmgrmetrics updated: make systemconfigfile optional

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

huijun pushed a commit to branch huijunw/healthmgrmetrics
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git


The following commit(s) were added to refs/heads/huijunw/healthmgrmetrics by this push:
     new 0842778  make systemconfigfile optional
0842778 is described below

commit 084277848ce74a405fbeaf51bf1a394eb364aca3
Author: Huijun Wu <hu...@twitter.com>
AuthorDate: Tue Apr 10 13:41:30 2018 -0700

    make systemconfigfile optional
---
 heron/executor/src/python/heron_executor.py                           | 4 +---
 heron/executor/tests/python/heron_executor_unittest.py                | 4 +---
 .../healthmgr/src/java/com/twitter/heron/healthmgr/HealthManager.java | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/heron/executor/src/python/heron_executor.py b/heron/executor/src/python/heron_executor.py
index b97dd67..3d0ddd6 100755
--- a/heron/executor/src/python/heron_executor.py
+++ b/heron/executor/src/python/heron_executor.py
@@ -499,9 +499,7 @@ class HeronExecutor(object):
                      "--role", self.role,
                      "--environment", self.environment,
                      "--topology_name", self.topology_name,
-                     "--metricsmgr_port", self.metrics_manager_port,
-                     "--system_config_file", self.heron_internals_config_file,
-                     "--override_config_file", self.override_config_file]
+                     "--metricsmgr_port", self.metrics_manager_port]
 
     return healthmgr_cmd
 
diff --git a/heron/executor/tests/python/heron_executor_unittest.py b/heron/executor/tests/python/heron_executor_unittest.py
index dab237e..de5a426 100644
--- a/heron/executor/tests/python/heron_executor_unittest.py
+++ b/heron/executor/tests/python/heron_executor_unittest.py
@@ -131,9 +131,7 @@ class HeronExecutorTest(unittest.TestCase):
              "-Xloggc:log-files/gc.healthmgr.log -Djava.net.preferIPv4Stack=true " \
              "-cp scheduler_classpath:healthmgr_classpath " \
              "com.twitter.heron.healthmgr.HealthManager --cluster cluster --role role " \
-             "--environment environ --topology_name topname --metricsmgr_port metricsmgr_port " \
-             "--system_config_file %s --override_config_file %s" %\
-             (INTERNAL_CONF_PATH, OVERRIDE_PATH)
+             "--environment environ --topology_name topname --metricsmgr_port metricsmgr_port"
 
   def get_expected_instance_command(component_name, instance_id, container_id):
     instance_name = "container_%d_%s_%d" % (container_id, component_name, instance_id)
diff --git a/heron/healthmgr/src/java/com/twitter/heron/healthmgr/HealthManager.java b/heron/healthmgr/src/java/com/twitter/heron/healthmgr/HealthManager.java
index e6325d9..caeac01 100644
--- a/heron/healthmgr/src/java/com/twitter/heron/healthmgr/HealthManager.java
+++ b/heron/healthmgr/src/java/com/twitter/heron/healthmgr/HealthManager.java
@@ -203,8 +203,8 @@ public class HealthManager {
 
     // Add the SystemConfig into SingletonRegistry
     SystemConfig systemConfig = SystemConfig.newBuilder(true)
-        .putAll(getOptionValue(cmd, CliArgs.SYSTEM_CONFIG_FILEPATH), true)
-        .putAll(getOptionValue(cmd, CliArgs.OVERRIDE_CONFIG_FILEPATH), true).build();
+        .putAll(Context.systemFile(config), true)
+        .putAll(Context.overrideFile(config), true).build();
     SingletonRegistry.INSTANCE.registerSingleton(SystemConfig.HERON_SYSTEM_CONFIG, systemConfig);
 
     LOG.info("Static Heron config loaded successfully ");

-- 
To stop receiving notification emails like this one, please contact
huijun@apache.org.