commit 1b325e6110414d9b425b4c74fd72e1e40bb98c9c
author Meng Li (Ethan) <ethanopensource@gmail.com> Tue Apr 14 16:35:37 2020 -0500
committer Ethan Li <ethanopensource@gmail.com> Wed Apr 15 09:08:18 2020 -0500
tree 27a1fd1ceeb804c622f46bd2c4da7860d126cbb6
parent c122876f1518f5e737ca0ea831e8c853af8d6a79

[STORM-3622] use ThreadStatesGaugeSet instead of CachedThreadStatesGaugeSet to avoid race condition in CachedGauge

storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java

diff --git a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
index 9c68c89..70e4696 100644
--- a/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
+++ b/storm-client/src/jvm/org/apache/storm/metric/SystemBolt.java
@@ -13,13 +13,12 @@
 package org.apache.storm.metric;
 
 import com.codahale.metrics.Gauge;
-import com.codahale.metrics.jvm.CachedThreadStatesGaugeSet;
 import com.codahale.metrics.jvm.GarbageCollectorMetricSet;
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
+import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import org.apache.storm.Config;
 import org.apache.storm.metric.api.IMetric;
 import org.apache.storm.task.IBolt;
@@ -43,10 +42,8 @@
         }
         prepareWasCalled = true;
 
-        int bucketSize = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS));
-
         context.registerMetricSet("GC", new GarbageCollectorMetricSet());
-        context.registerMetricSet("threads", new CachedThreadStatesGaugeSet(bucketSize, TimeUnit.SECONDS));
+        context.registerMetricSet("threads", new ThreadStatesGaugeSet());
         context.registerMetricSet("memory", new MemoryUsageGaugeSet());
 
         final RuntimeMXBean jvmRt = ManagementFactory.getRuntimeMXBean();
@@ -87,6 +84,7 @@
             }
         });
 
+        int bucketSize = ObjectReader.getInt(topoConf.get(Config.TOPOLOGY_BUILTIN_METRICS_BUCKET_SIZE_SECS));
         registerMetrics(context, (Map<String, String>) topoConf.get(Config.WORKER_METRICS), bucketSize, topoConf);
         registerMetrics(context, (Map<String, String>) topoConf.get(Config.TOPOLOGY_WORKER_METRICS), bucketSize, topoConf);
     }