Move HealthCountsStream subscribe outside synchronized block

Netflix · Apr 7, 2017 · 0fc69b8 · 0fc69b8
1 parent 562d01f
commit 0fc69b8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/metric/consumer/HealthCountsStream.java b/hystrix-core/src/main/java/com/netflix/hystrix/metric/consumer/HealthCountsStream.java
@@ -67,18 +67,21 @@ public static HealthCountsStream getInstance(HystrixCommandKey commandKey, int n
         if (initialStream != null) {
             return initialStream;
         } else {
+            final HealthCountsStream healthStream;
             synchronized (HealthCountsStream.class) {
                 HealthCountsStream existingStream = streams.get(commandKey.name());
                 if (existingStream == null) {
                     HealthCountsStream newStream = new HealthCountsStream(commandKey, numBuckets, bucketSizeInMs,
                             HystrixCommandMetrics.appendEventToBucket);
-                    newStream.startCachingStreamValuesIfUnstarted();
+
                     streams.putIfAbsent(commandKey.name(), newStream);
-                    return newStream;
+                    healthStream = newStream;
                 } else {
-                    return existingStream;
+                    healthStream = existingStream;
                 }
             }
+            healthStream.startCachingStreamValuesIfUnstarted();
+            return healthStream;
         }
     }