You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@heron.apache.org by hu...@apache.org on 2018/06/18 21:39:25 UTC
[incubator-heron] branch huijunw/togglepolicy updated: clean comment
This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch huijunw/togglepolicy
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/huijunw/togglepolicy by this push:
new e28ea14 clean comment
e28ea14 is described below
commit e28ea14ecb51572ea6aa0328e074d66ee1958609
Author: Huijun Wu <hu...@twitter.com>
AuthorDate: Mon Jun 18 14:39:05 2018 -0700
clean comment
---
heron/config/src/yaml/conf/local/healthmgr.yaml | 18 +++++++++---------
.../heron/healthmgr/common/PhysicalPlanProvider.java | 2 --
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/heron/config/src/yaml/conf/local/healthmgr.yaml b/heron/config/src/yaml/conf/local/healthmgr.yaml
index 562715c..aa49572 100644
--- a/heron/config/src/yaml/conf/local/healthmgr.yaml
+++ b/heron/config/src/yaml/conf/local/healthmgr.yaml
@@ -18,19 +18,19 @@
# Topology health manager mode:
# disabled = do not launch the health manager
# cluster = launch the health manager on container-0
-heron.topology.healthmgr.mode: cluster
+heron.topology.healthmgr.mode: disabled
# Default class and url for providing metrics
-heron.healthmgr.metricsource.type: org.apache.heron.healthmgr.sensors.MetricsCacheMetricsProvider
+heron.healthmgr.metricsource.type: org.apache.heron.healthmgr.sensors.TrackerMetricsProvider
heron.healthmgr.metricsource.url: http://localhost:8888
# Enable MetricsCache if MetricsCache is chosen as metrics provider
-heron.topology.metricscachemgr.mode: cluster
+#heron.topology.metricscachemgr.mode: cluster
## list of policies to be executed for self regulation
-heron.class.health.policies:
+#heron.class.health.policies:
# - dynamic-resource-allocation
- - auto-restart-backpressure-container
+# - auto-restart-backpressure-container
#
## configuration specific to individual policies listed above
#dynamic-resource-allocation:
@@ -38,7 +38,7 @@ heron.class.health.policies:
# health.policy.interval.ms: 120000
# BackPressureDetector.noiseFilterMillis: 20
# GrowingWaitQueueDetector.limit: 5
-auto-restart-backpressure-container:
- health.policy.class: org.apache.heron.healthmgr.policy.AutoRestartBackpressureContainerPolicy
- health.policy.interval.ms: 120000
- BackPressureDetector.noiseFilterMillis: 20
+#auto-restart-backpressure-container:
+# health.policy.class: org.apache.heron.healthmgr.policy.AutoRestartBackpressureContainerPolicy
+# health.policy.interval.ms: 120000
+# BackPressureDetector.noiseFilterMillis: 20
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 94c8aa3..eca7dfb 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
@@ -78,12 +78,10 @@ public class PhysicalPlanProvider implements Provider<PhysicalPlan> {
@Override
public synchronized PhysicalPlan get() {
-// if (physicalPlan == null) {
physicalPlan = stateManagerAdaptor.getPhysicalPlan(topologyName);
if (physicalPlan == null) {
throw new InvalidStateException(topologyName, "Failed to fetch the physical plan");
}
-// }
return physicalPlan;
}