This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new 3aea542 refactor healthmgr build (#2912)
3aea542 is described below
commit 3aea542dd2dda537d88324dc6006e875f721dbae
Author: bed debug <[email protected]>
AuthorDate: Wed May 30 21:00:13 2018 -0700
refactor healthmgr build (#2912)
* refactor healthmgr build
* fix compile
---
heron/healthmgr/src/java/BUILD | 15 ++++++++++-----
.../java/org/apache/heron/healthmgr/HealthManager.java | 8 ++++----
.../org/apache/heron/healthmgr/HealthPolicyConfig.java | 4 ++++
.../heron/healthmgr/common/PackingPlanProvider.java | 2 +-
.../heron/healthmgr/common/PhysicalPlanProvider.java | 2 +-
.../apache/heron/healthmgr/common/TopologyProvider.java | 2 +-
.../healthmgr/resolvers/RestartContainerResolver.java | 2 +-
.../healthmgr/sensors/MetricsCacheMetricsProvider.java | 2 +-
.../heron/healthmgr/sensors/TrackerMetricsProvider.java | 4 ++--
9 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/heron/healthmgr/src/java/BUILD b/heron/healthmgr/src/java/BUILD
index f713d1b..90ae6b3 100644
--- a/heron/healthmgr/src/java/BUILD
+++ b/heron/healthmgr/src/java/BUILD
@@ -2,6 +2,11 @@ licenses(["notice"])
package(default_visibility = ["//visibility:public"])
+files = glob(
+ ["**/*.java"],
+ exclude = ["**/HealthManager.java"],
+)
+
healthmgr_deps_files = [
"//heron/api/src/java:api-java-low-level",
"//heron/api/src/java:classification",
@@ -46,20 +51,20 @@ healthmgr_deps_files = [
]
filegroup(
- name = "exported-healthmgr-java-src",
- srcs = glob(["**/*.java"]),
+ name = "healthmgr-main",
+ srcs = glob(["**/HealthManager.java"]),
)
java_library(
name = "healthmgr-java",
- srcs = glob(["**/*.java"]),
+ srcs = files,
deps = heron_java_proto_files() + healthmgr_deps_files,
)
java_binary(
name = "healthmgr-unshaded",
- srcs = glob(["**/*.java"]),
- deps = heron_java_proto_files() + healthmgr_deps_files,
+ srcs = [":healthmgr-main"],
+ deps = heron_java_proto_files() + healthmgr_deps_files +
[":healthmgr-java"],
)
genrule(
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManager.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManager.java
index fdf1b61..ddc519e 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManager.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManager.java
@@ -66,6 +66,10 @@ import org.apache.heron.spi.statemgr.IStateManager;
import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
import org.apache.heron.spi.utils.ReflectionUtils;
+import static
org.apache.heron.healthmgr.HealthPolicyConfig.CONF_METRICS_SOURCE_TYPE;
+import static
org.apache.heron.healthmgr.HealthPolicyConfig.CONF_METRICS_SOURCE_URL;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
+
/**
* {@link HealthManager} makes a topology dynamic and self-regulating. This is
implemented using
* Dhalion library. The {@link HealthManager} will perform the following
functions to achieve its
@@ -104,10 +108,6 @@ import org.apache.heron.spi.utils.ReflectionUtils;
@Unstable
@Evolving
public class HealthManager {
- public static final String CONF_TOPOLOGY_NAME = "TOPOLOGY_NAME";
- public static final String CONF_METRICS_SOURCE_URL = "METRICS_SOURCE_URL";
- private static final String CONF_METRICS_SOURCE_TYPE = "METRICS_SOURCE_TYPE";
-
private static final Logger LOG =
Logger.getLogger(HealthManager.class.getName());
private final Config config;
private AbstractModule baseModule;
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthPolicyConfig.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthPolicyConfig.java
index 0ad4580..1256eb2 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthPolicyConfig.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthPolicyConfig.java
@@ -26,6 +26,10 @@ import java.util.logging.Logger;
import org.apache.heron.healthmgr.HealthPolicyConfigReader.PolicyConfigKey;
public class HealthPolicyConfig {
+ public static final String CONF_TOPOLOGY_NAME = "TOPOLOGY_NAME";
+ public static final String CONF_METRICS_SOURCE_URL = "METRICS_SOURCE_URL";
+ public static final String CONF_METRICS_SOURCE_TYPE = "METRICS_SOURCE_TYPE";
+
private static final Logger LOG =
Logger.getLogger(HealthPolicyConfig.class.getName());
private final Map<String, Object> configs;
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PackingPlanProvider.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PackingPlanProvider.java
index 1af4842..95ce489 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PackingPlanProvider.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PackingPlanProvider.java
@@ -39,7 +39,7 @@ import org.apache.heron.spi.packing.PackingPlan.InstancePlan;
import org.apache.heron.spi.packing.PackingPlanProtoDeserializer;
import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
/**
* A topology's packing plan may get updated after initial deployment. This
provider is used to
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PhysicalPlanProvider.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PhysicalPlanProvider.java
index 196ed89..79990e8 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PhysicalPlanProvider.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/PhysicalPlanProvider.java
@@ -33,7 +33,7 @@ import
org.apache.heron.healthmgr.common.HealthManagerEvents.TopologyUpdate;
import org.apache.heron.proto.system.PhysicalPlans.PhysicalPlan;
import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
/**
* A topology's physical plan may get updated after initial deployment. This
provider is used to
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/TopologyProvider.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/TopologyProvider.java
index c8912a2..6647106 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/TopologyProvider.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/TopologyProvider.java
@@ -36,7 +36,7 @@ import org.apache.heron.api.generated.TopologyAPI.Topology;
import org.apache.heron.healthmgr.common.HealthManagerEvents.TopologyUpdate;
import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
/**
* A topology may be updated after initial deployment. This provider is used
to provide the latest
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/RestartContainerResolver.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/RestartContainerResolver.java
index 1454404..44b91aa 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/RestartContainerResolver.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/RestartContainerResolver.java
@@ -41,7 +41,7 @@ import
org.apache.heron.healthmgr.common.HealthManagerEvents.ContainerRestart;
import org.apache.heron.proto.scheduler.Scheduler.RestartTopologyRequest;
import org.apache.heron.scheduler.client.ISchedulerClient;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
import static
org.apache.heron.healthmgr.detectors.BaseDetector.SymptomType.SYMPTOM_INSTANCE_BACK_PRESSURE;
public class RestartContainerResolver implements IResolver {
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/MetricsCacheMetricsProvider.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/MetricsCacheMetricsProvider.java
index e349fa8..ac2498a 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/MetricsCacheMetricsProvider.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/MetricsCacheMetricsProvider.java
@@ -45,7 +45,7 @@ import
org.apache.heron.proto.tmaster.TopologyMaster.MetricsCacheLocation;
import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
import org.apache.heron.spi.utils.NetworkUtils;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
public class MetricsCacheMetricsProvider implements MetricsProvider {
private static final String PATH_STATS = "stats";
diff --git
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/TrackerMetricsProvider.java
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/TrackerMetricsProvider.java
index 7fdc479..742f618 100644
---
a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/TrackerMetricsProvider.java
+++
b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/TrackerMetricsProvider.java
@@ -43,8 +43,8 @@ import com.microsoft.dhalion.core.Measurement;
import net.minidev.json.JSONArray;
-import static org.apache.heron.healthmgr.HealthManager.CONF_METRICS_SOURCE_URL;
-import static org.apache.heron.healthmgr.HealthManager.CONF_TOPOLOGY_NAME;
+import static
org.apache.heron.healthmgr.HealthPolicyConfig.CONF_METRICS_SOURCE_URL;
+import static org.apache.heron.healthmgr.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
public class TrackerMetricsProvider implements MetricsProvider {
public static final String CONF_CLUSTER = "CLUSTER";
--
To stop receiving notification emails like this one, please contact
[email protected].
