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/08/13 22:45:04 UTC

[incubator-heron] branch master updated: [healthmgr] refactor physicalplanprovider and topologyprovider (#2979)

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 104869d  [healthmgr] refactor physicalplanprovider and topologyprovider (#2979)
104869d is described below

commit 104869d73f3fb87e524c5e102732d9d1c31cd4e5
Author: bed debug <hu...@users.noreply.github.com>
AuthorDate: Mon Aug 13 15:45:00 2018 -0700

    [healthmgr] refactor physicalplanprovider and topologyprovider (#2979)
    
    * verbose log for debug
    
    * refactor healthmgr
    
    * refactor 2
    
    * refactor ppprovider
    
    * fix compile
    
    * fix pplan exception
    
    * update print
    
    * fixcomments
    
    * change log to fine, when the verbose is enabled
    
    * add verbose
    
    * use list
---
 .../healthmgr/common/PhysicalPlanProvider.java     | 133 +++++++++++++++------
 .../heron/healthmgr/common/TopologyProvider.java   | 101 ----------------
 .../heron/healthmgr/policy/ToggleablePolicy.java   |  39 +++---
 .../resolvers/RestartContainerResolver.java        |   4 +-
 .../heron/healthmgr/resolvers/ScaleUpResolver.java |  10 +-
 .../healthmgr/sensors/BackPressureSensor.java      |  10 +-
 .../heron/healthmgr/sensors/BufferSizeSensor.java  |  10 +-
 .../healthmgr/sensors/ExecuteCountSensor.java      |  10 +-
 8 files changed, 145 insertions(+), 172 deletions(-)

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 eca7dfb..a563cd0 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
@@ -19,25 +19,27 @@
 
 package org.apache.heron.healthmgr.common;
 
+import java.net.HttpURLConnection;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
 import java.util.logging.Logger;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
 
-import com.microsoft.dhalion.events.EventHandler;
-import com.microsoft.dhalion.events.EventManager;
-
-import org.apache.heron.healthmgr.common.HealthManagerEvents.ContainerRestart;
-import org.apache.heron.healthmgr.common.HealthManagerEvents.TopologyUpdate;
+import org.apache.heron.api.generated.TopologyAPI;
 import org.apache.heron.proto.system.PhysicalPlans.PhysicalPlan;
+import org.apache.heron.proto.tmaster.TopologyMaster;
 import org.apache.heron.spi.statemgr.SchedulerStateManagerAdaptor;
+import org.apache.heron.spi.utils.NetworkUtils;
 
 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
- * fetch the latest version from the state manager and provide to any dependent components.
+ * A topology's physical plan may get updated at runtime. This provider is used to
+ * fetch the latest version from the tmaster and provide to any dependent components.
  */
 public class PhysicalPlanProvider implements Provider<PhysicalPlan> {
   private static final Logger LOG = Logger.getLogger(PhysicalPlanProvider.class.getName());
@@ -45,44 +47,107 @@ public class PhysicalPlanProvider implements Provider<PhysicalPlan> {
   private final SchedulerStateManagerAdaptor stateManagerAdaptor;
   private final String topologyName;
 
-  private PhysicalPlan physicalPlan;
+  // Cache the physical plan between two successful get() invocations.
+  private PhysicalPlan physicalPlan = null;
 
   @Inject
   public PhysicalPlanProvider(SchedulerStateManagerAdaptor stateManagerAdaptor,
-      EventManager eventManager, @Named(CONF_TOPOLOGY_NAME) String topologyName) {
+                              @Named(CONF_TOPOLOGY_NAME) String topologyName) {
     this.stateManagerAdaptor = stateManagerAdaptor;
     this.topologyName = topologyName;
-    eventManager.addEventListener(TopologyUpdate.class, new EventHandler<TopologyUpdate>() {
-      /**
-       * Invalidates cached physical plan on receiving topology update notification
-       */
-      @Override
-      public synchronized void onEvent(TopologyUpdate event) {
-        LOG.info(
-            "Received topology update event, invalidating cached PhysicalPlan: " + event.type());
-        physicalPlan = null;
-      }
-    });
-    eventManager.addEventListener(ContainerRestart.class, new EventHandler<ContainerRestart>() {
-      /**
-       * Invalidates cached physical plan on receiving container restart notification
-       */
-      @Override
-      public synchronized void onEvent(ContainerRestart event) {
-        LOG.info("Received container restart event, invalidating cached PhysicalPlan: "
-            + event.type());
-        physicalPlan = null;
-      }
-    });
+  }
+
+  protected PhysicalPlan ParseResponseToPhysicalPlan(byte[] responseData) {
+    // byte to base64 string
+    String encodedString = new String(responseData);
+    LOG.fine("tmaster returns physical plan in base64 str: " + encodedString);
+    // base64 string to proto bytes
+    byte[] decodedBytes = Base64.getDecoder().decode(encodedString);
+    // construct proto obj from bytes
+    PhysicalPlan physicalPlan = null;
+    try {
+      physicalPlan = PhysicalPlan.parseFrom(decodedBytes);
+    } catch (Exception e) {
+      throw new InvalidStateException(topologyName, "Failed to fetch the physical plan");
+    }
+    return physicalPlan;
   }
 
   @Override
   public synchronized PhysicalPlan get() {
-    physicalPlan = stateManagerAdaptor.getPhysicalPlan(topologyName);
-    if (physicalPlan == null) {
-      throw new InvalidStateException(topologyName, "Failed to fetch the physical plan");
+    TopologyMaster.TMasterLocation tMasterLocation
+        = stateManagerAdaptor.getTMasterLocation(topologyName);
+    String host = tMasterLocation.getHost();
+    int port = tMasterLocation.getControllerPort();
+
+    // construct metric cache stat url
+    String url = "http://" + host + ":" + port + "/get_current_physical_plan";
+    LOG.fine("tmaster physical plan query endpoint: " + url);
+
+    // http communication
+    HttpURLConnection con = NetworkUtils.getHttpConnection(url);
+    NetworkUtils.sendHttpGetRequest(con);
+    byte[] responseData = NetworkUtils.readHttpResponse(con);
+
+    physicalPlan = ParseResponseToPhysicalPlan(responseData);
+    return physicalPlan;
+  }
+
+  /**
+   * try best effort to return a latest physical plan
+   * 1. refresh physical plan
+   * 2. if refreshing fails, return the last physical plan
+   * @return physical plan
+   */
+  public PhysicalPlan getPhysicalPlan() {
+    try {
+      get();
+    } catch (InvalidStateException e) {
+      if (physicalPlan == null) {
+        throw e;
+      }
     }
     return physicalPlan;
   }
 
+  /**
+   * A utility method to extract bolt component names from the topology.
+   *
+   * @return list of all bolt names
+   */
+  public List<String> getBoltNames(PhysicalPlan pp) {
+    TopologyAPI.Topology localTopology = pp.getTopology();
+    ArrayList<String> boltNames = new ArrayList<>();
+    for (TopologyAPI.Bolt bolt : localTopology.getBoltsList()) {
+      boltNames.add(bolt.getComp().getName());
+    }
+
+    return boltNames;
+  }
+
+  public List<String> getBoltNames() {
+    PhysicalPlan pp = getPhysicalPlan();
+    return getBoltNames(pp);
+  }
+
+  /**
+   * A utility method to extract spout component names from the topology.
+   *
+   * @return list of all spout names
+   */
+  public List<String> getSpoutNames(PhysicalPlan pp) {
+    TopologyAPI.Topology localTopology = pp.getTopology();
+    ArrayList<String> spoutNames = new ArrayList<>();
+    for (TopologyAPI.Spout spout : localTopology.getSpoutsList()) {
+      spoutNames.add(spout.getComp().getName());
+    }
+
+    return spoutNames;
+  }
+
+  public List<String> getSpoutNames() {
+    PhysicalPlan pp = getPhysicalPlan();
+    return getSpoutNames(pp);
+  }
+
 }
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
deleted file mode 100644
index 6647106..0000000
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/common/TopologyProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.heron.healthmgr.common;
-
-import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import com.microsoft.dhalion.events.EventHandler;
-import com.microsoft.dhalion.events.EventManager;
-
-import org.apache.heron.api.generated.TopologyAPI;
-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.HealthPolicyConfig.CONF_TOPOLOGY_NAME;
-
-/**
- * A topology may be updated after initial deployment. This provider is used to provide the latest
- * version to any dependent components.
- */
-@Singleton
-public class TopologyProvider implements Provider<Topology>, EventHandler<TopologyUpdate> {
-  private static final Logger LOG = Logger.getLogger(TopologyProvider.class.getName());
-  private final SchedulerStateManagerAdaptor stateManagerAdaptor;
-  private final String topologyName;
-
-  private Topology topology;
-
-  @Inject
-  public TopologyProvider(SchedulerStateManagerAdaptor stateManagerAdaptor,
-                          EventManager eventManager,
-                          @Named(CONF_TOPOLOGY_NAME) String topologyName) {
-    this.stateManagerAdaptor = stateManagerAdaptor;
-    this.topologyName = topologyName;
-    eventManager.addEventListener(TopologyUpdate.class, this);
-  }
-
-  @Override
-  public synchronized Topology get() {
-    if (topology == null) {
-      fetchLatestTopology();
-    }
-    return topology;
-  }
-
-  private synchronized void fetchLatestTopology() {
-    LOG.log(Level.INFO, "Fetching topology from state manager: {0}", topologyName);
-    this.topology = stateManagerAdaptor.getPhysicalPlan(topologyName).getTopology();
-    if (topology == null) {
-      throw new InvalidStateException(topologyName, "Failed to fetch topology info");
-    }
-  }
-
-  /**
-   * Invalidates cached topology instance on receiving update notification
-   */
-  @Override
-  public synchronized void onEvent(TopologyUpdate event) {
-    LOG.info("Received topology update event, invalidating cached topology: " + event);
-    this.topology = null;
-  }
-
-  /**
-   * A utility method to extract bolt component names from the topology.
-   *
-   * @return array of all bolt names
-   */
-  public String[] getBoltNames() {
-    Topology localTopology = get();
-    ArrayList<String> boltNames = new ArrayList<>();
-    for (TopologyAPI.Bolt bolt : localTopology.getBoltsList()) {
-      boltNames.add(bolt.getComp().getName());
-    }
-
-    return boltNames.toArray(new String[boltNames.size()]);
-  }
-}
diff --git a/heron/healthmgr/src/java/org/apache/heron/healthmgr/policy/ToggleablePolicy.java b/heron/healthmgr/src/java/org/apache/heron/healthmgr/policy/ToggleablePolicy.java
index e88ab5a..316d8fa 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/policy/ToggleablePolicy.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/policy/ToggleablePolicy.java
@@ -75,24 +75,33 @@ public class ToggleablePolicy extends HealthPolicyImpl {
 
   @Override
   public Collection<Measurement> executeSensors() {
-    for (TopologyAPI.Config.KeyValue kv
-        : physicalPlanProvider.get().getTopology().getTopologyConfig().getKvsList()) {
-      LOG.fine("kv " + kv.getKey() + ":" + kv.getValue());
-      if (kv.getKey().equals(policyIdRuntime)) {
-        try {
-          PolicyMode val = PolicyMode.valueOf(kv.getValue());
-          if (!policyMode.equals(val)) {
-            policyMode = val;
-            LOG.info("policy " + policyId + " status changed to " + policyMode);
-          } else {
-            LOG.fine("policy " + policyId + " status remains same " + policyMode);
+    LOG.fine("--------- policy: " + policyId + " ---------");
+    try {
+      for (TopologyAPI.Config.KeyValue kv
+          : physicalPlanProvider.get().getTopology().getTopologyConfig().getKvsList()) {
+        if (kv.getKey().endsWith(":runtime")) {
+          LOG.fine("kv:runtime " + kv.getKey() + " -> " + kv.getValue());
+          if (kv.getKey().equals(policyIdRuntime)) {
+            try {
+              PolicyMode val = PolicyMode.valueOf(kv.getValue());
+              if (!policyMode.equals(val)) {
+                policyMode = val;
+                LOG.info("policy " + policyId + " status changed to " + policyMode);
+              } else {
+                LOG.fine("policy " + policyId + " status remains same " + policyMode);
+              }
+              break;
+            } catch (IllegalArgumentException e) {
+              LOG.warning("policy " + policyId + " status does not change " + policyMode
+                  + "; unknown input " + kv.getValue());
+            }
           }
-          break;
-        } catch (IllegalArgumentException e) {
-          LOG.warning("policy " + policyId + " status does not change " + policyMode
-              + "; unknown input " + kv.getValue());
         }
       }
+    } catch (Exception e) {
+      LOG.warning(
+          "failed to fetch the latest physical plan and skip policy toggle update: "
+              + e.toString());
     }
 
     if (policyMode.equals(PolicyMode.activated)) {
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 85a624c..473f465 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
@@ -44,8 +44,8 @@ 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 {
-  public static final String RESTART_CONTAINER_RESOLVER = "RestartContainerResolver";
-  private static final Logger LOG = Logger.getLogger(RestartContainerResolver.class.getName());
+  public static final String RESTART_CONTAINER_RESOLVER = RestartContainerResolver.class.getName();
+  private static final Logger LOG = Logger.getLogger(RESTART_CONTAINER_RESOLVER);
 
   private final EventManager eventManager;
   private final String topologyName;
diff --git a/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/ScaleUpResolver.java b/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/ScaleUpResolver.java
index 7128162..bef0a74 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/ScaleUpResolver.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/resolvers/ScaleUpResolver.java
@@ -44,7 +44,7 @@ import org.apache.heron.api.generated.TopologyAPI.Topology;
 import org.apache.heron.common.basics.SysUtils;
 import org.apache.heron.healthmgr.common.HealthManagerEvents.TopologyUpdate;
 import org.apache.heron.healthmgr.common.PackingPlanProvider;
-import org.apache.heron.healthmgr.common.TopologyProvider;
+import org.apache.heron.healthmgr.common.PhysicalPlanProvider;
 import org.apache.heron.proto.scheduler.Scheduler;
 import org.apache.heron.proto.system.PackingPlans;
 import org.apache.heron.scheduler.client.ISchedulerClient;
@@ -62,7 +62,7 @@ import static org.apache.heron.healthmgr.sensors.BaseSensor.MetricName.METRIC_BA
 public class ScaleUpResolver implements IResolver {
   private static final Logger LOG = Logger.getLogger(ScaleUpResolver.class.getName());
 
-  private TopologyProvider topologyProvider;
+  private PhysicalPlanProvider physicalPlanProvider;
   private PackingPlanProvider packingPlanProvider;
   private ISchedulerClient schedulerClient;
   private EventManager eventManager;
@@ -70,12 +70,12 @@ public class ScaleUpResolver implements IResolver {
   private ExecutionContext context;
 
   @Inject
-  public ScaleUpResolver(TopologyProvider topologyProvider,
+  public ScaleUpResolver(PhysicalPlanProvider physicalPlanProvider,
                          PackingPlanProvider packingPlanProvider,
                          ISchedulerClient schedulerClient,
                          EventManager eventManager,
                          Config config) {
-    this.topologyProvider = topologyProvider;
+    this.physicalPlanProvider = physicalPlanProvider;
     this.packingPlanProvider = packingPlanProvider;
     this.schedulerClient = schedulerClient;
     this.eventManager = eventManager;
@@ -194,7 +194,7 @@ public class ScaleUpResolver implements IResolver {
     // Create an instance of the packing class
     IRepacking packing = getRepackingClass(Context.repackingClass(config));
 
-    Topology topology = topologyProvider.get();
+    Topology topology = physicalPlanProvider.get().getTopology();
     try {
       packing.initialize(config, topology);
       return packing.repack(currentPackingPlan, componentDeltas);
diff --git a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BackPressureSensor.java b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BackPressureSensor.java
index aa9d35f..857b17b 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BackPressureSensor.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BackPressureSensor.java
@@ -33,7 +33,7 @@ import com.microsoft.dhalion.core.MeasurementsTable;
 import org.apache.heron.healthmgr.HealthManagerMetrics;
 import org.apache.heron.healthmgr.HealthPolicyConfig;
 import org.apache.heron.healthmgr.common.PackingPlanProvider;
-import org.apache.heron.healthmgr.common.TopologyProvider;
+import org.apache.heron.healthmgr.common.PhysicalPlanProvider;
 
 import static org.apache.heron.healthmgr.sensors.BaseSensor.MetricName.METRIC_BACK_PRESSURE;
 
@@ -42,20 +42,20 @@ public class BackPressureSensor extends BaseSensor {
 
   private final MetricsProvider metricsProvider;
   private final PackingPlanProvider packingPlanProvider;
-  private final TopologyProvider topologyProvider;
+  private final PhysicalPlanProvider physicalPlanProvider;
   private HealthManagerMetrics publishingMetrics;
 
   @Inject
   public BackPressureSensor(PackingPlanProvider packingPlanProvider,
-                            TopologyProvider topologyProvider,
+                            PhysicalPlanProvider physicalPlanProvider,
                             HealthPolicyConfig policyConfig,
                             MetricsProvider metricsProvider,
                             HealthManagerMetrics publishingMetrics) {
     super(policyConfig, METRIC_BACK_PRESSURE.text(), BackPressureSensor.class.getSimpleName());
     this.packingPlanProvider = packingPlanProvider;
-    this.topologyProvider = topologyProvider;
     this.metricsProvider = metricsProvider;
     this.publishingMetrics = publishingMetrics;
+    this.physicalPlanProvider = physicalPlanProvider;
   }
 
   /**
@@ -70,7 +70,7 @@ public class BackPressureSensor extends BaseSensor {
     Collection<Measurement> result = new ArrayList<>();
     Instant now = context.checkpoint();
 
-    String[] boltComponents = topologyProvider.getBoltNames();
+    List<String> boltComponents = physicalPlanProvider.getBoltNames();
     Duration duration = getDuration();
     for (String component : boltComponents) {
       String[] boltInstanceNames = packingPlanProvider.getBoltInstanceNames(component);
diff --git a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BufferSizeSensor.java b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BufferSizeSensor.java
index 6678b35..9ed271a 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BufferSizeSensor.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/BufferSizeSensor.java
@@ -32,23 +32,23 @@ import com.microsoft.dhalion.core.MeasurementsTable;
 
 import org.apache.heron.healthmgr.HealthPolicyConfig;
 import org.apache.heron.healthmgr.common.PackingPlanProvider;
-import org.apache.heron.healthmgr.common.TopologyProvider;
+import org.apache.heron.healthmgr.common.PhysicalPlanProvider;
 
 import static org.apache.heron.healthmgr.sensors.BaseSensor.MetricName.METRIC_WAIT_Q_SIZE;
 
 public class BufferSizeSensor extends BaseSensor {
   private final MetricsProvider metricsProvider;
   private final PackingPlanProvider packingPlanProvider;
-  private final TopologyProvider topologyProvider;
+  private final PhysicalPlanProvider physicalPlanProvider;
 
   @Inject
   public BufferSizeSensor(HealthPolicyConfig policyConfig,
                           PackingPlanProvider packingPlanProvider,
-                          TopologyProvider topologyProvider,
+                          PhysicalPlanProvider physicalPlanProvider,
                           MetricsProvider metricsProvider) {
     super(policyConfig, METRIC_WAIT_Q_SIZE.text(), BufferSizeSensor.class.getSimpleName());
     this.packingPlanProvider = packingPlanProvider;
-    this.topologyProvider = topologyProvider;
+    this.physicalPlanProvider = physicalPlanProvider;
     this.metricsProvider = metricsProvider;
   }
 
@@ -62,7 +62,7 @@ public class BufferSizeSensor extends BaseSensor {
     Collection<Measurement> result = new ArrayList<>();
     Instant now = context.checkpoint();
 
-    String[] boltComponents = topologyProvider.getBoltNames();
+    List<String> boltComponents = physicalPlanProvider.getBoltNames();
     Duration duration = getDuration();
 
     for (String component : boltComponents) {
diff --git a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/ExecuteCountSensor.java b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/ExecuteCountSensor.java
index f82472d..d38df4c 100644
--- a/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/ExecuteCountSensor.java
+++ b/heron/healthmgr/src/java/org/apache/heron/healthmgr/sensors/ExecuteCountSensor.java
@@ -30,27 +30,27 @@ import com.microsoft.dhalion.api.MetricsProvider;
 import com.microsoft.dhalion.core.Measurement;
 
 import org.apache.heron.healthmgr.HealthPolicyConfig;
-import org.apache.heron.healthmgr.common.TopologyProvider;
+import org.apache.heron.healthmgr.common.PhysicalPlanProvider;
 
 import static org.apache.heron.healthmgr.sensors.BaseSensor.MetricName.METRIC_EXE_COUNT;
 
 public class ExecuteCountSensor extends BaseSensor {
-  private final TopologyProvider topologyProvider;
+  private final PhysicalPlanProvider physicalPlanProvider;
   private final MetricsProvider metricsProvider;
   private Instant now;
 
   @Inject
-  ExecuteCountSensor(TopologyProvider topologyProvider,
+  ExecuteCountSensor(PhysicalPlanProvider physicalPlanProvider,
                      HealthPolicyConfig policyConfig,
                      MetricsProvider metricsProvider) {
     super(policyConfig, METRIC_EXE_COUNT.text(), ExecuteCountSensor.class.getSimpleName());
-    this.topologyProvider = topologyProvider;
+    this.physicalPlanProvider = physicalPlanProvider;
     this.metricsProvider = metricsProvider;
   }
 
   @Override
   public Collection<Measurement> fetch() {
-    List<String> bolts = Arrays.asList(topologyProvider.getBoltNames());
+    List<String> bolts = physicalPlanProvider.getBoltNames();
     now = context.checkpoint();
     return metricsProvider.getMeasurements(now, getDuration(), getMetricTypes(), bolts);
   }