Repository: ambari Updated Branches: refs/heads/branch-2.4 082f05c8e -> fba361aa2
AMBARI-17149 : HadoopTimelineMetricsSink from AMS prevents HBase RS process shutdown (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fba361aa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fba361aa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fba361aa Branch: refs/heads/branch-2.4 Commit: fba361aa20eb94eb25e99f879572061dfe2a3c72 Parents: 082f05c Author: Aravindan Vijayan <[email protected]> Authored: Fri Jun 10 09:34:23 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Fri Jun 10 09:45:21 2016 -0700 ---------------------------------------------------------------------- .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fba361aa/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java index 0580088..ebbf342 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java @@ -47,6 +47,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; @InterfaceAudience.Public @InterfaceStability.Evolving @@ -66,8 +67,14 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple private SubsetConfiguration conf; // Cache the rpc port used and the suffix to use if the port tag is found private Map<String, String> rpcPortSuffixes = new HashMap<>(10); - private final ExecutorService executorService = Executors.newSingleThreadExecutor(); + private final ExecutorService executorService = Executors.newSingleThreadExecutor(new ThreadFactory() { + public Thread newThread(Runnable r) { + Thread t = Executors.defaultThreadFactory().newThread(r); + t.setDaemon(true); + return t; + } + }); @Override public void init(SubsetConfiguration conf) { @@ -413,5 +420,6 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple } } }); + executorService.shutdown(); } }
