Output setting around maximum thread pool size and whether this confi…

…g is enabled
Netflix · Oct 20, 2016 · f68bd2f · f68bd2f
1 parent 643d680
commit f68bd2f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java b/...c/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixConfigurationJsonStream.java
@@ -120,6 +120,7 @@ private static void writeThreadPoolConfigJson(JsonGenerator json, HystrixThreadP
         json.writeNumberField("maxQueueSize", threadPoolConfig.getMaxQueueSize());
         json.writeNumberField("queueRejectionThreshold", threadPoolConfig.getQueueRejectionThreshold());
         json.writeNumberField("keepAliveTimeInMinutes", threadPoolConfig.getKeepAliveTimeInMinutes());
+        json.writeBooleanField("allowMaximumSizeToDivergeFromCoreSize", threadPoolConfig.getAllowMaximumSizeToDivergeFromCoreSize());
         json.writeNumberField("counterBucketSizeInMilliseconds", threadPoolConfig.getRollingCounterBucketSizeInMilliseconds());
         json.writeNumberField("counterBucketCount", threadPoolConfig.getRollingCounterNumberOfBuckets());
         json.writeEndObject();

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/config/HystrixThreadPoolConfiguration.java b/hystrix-core/src/main/java/com/netflix/hystrix/config/HystrixThreadPoolConfiguration.java
@@ -27,18 +27,20 @@ public class HystrixThreadPoolConfiguration {
     private final int maxQueueSize;
     private final int queueRejectionThreshold;
     private final int keepAliveTimeInMinutes;
+    private final boolean allowMaximumSizeToDivergeFromCoreSize;
     private final int rollingCounterNumberOfBuckets;
     private final int rollingCounterBucketSizeInMilliseconds;
 
     public HystrixThreadPoolConfiguration(HystrixThreadPoolKey threadPoolKey, int coreSize, int maximumSize, int maxQueueSize, int queueRejectionThreshold,
-                                           int keepAliveTimeInMinutes, int rollingCounterNumberOfBuckets,
+                                           int keepAliveTimeInMinutes, boolean allowMaximumSizeToDivergeFromCoreSize, int rollingCounterNumberOfBuckets,
                                            int rollingCounterBucketSizeInMilliseconds) {
         this.threadPoolKey = threadPoolKey;
         this.coreSize = coreSize;
         this.maximumSize = maximumSize;
         this.maxQueueSize = maxQueueSize;
         this.queueRejectionThreshold = queueRejectionThreshold;
         this.keepAliveTimeInMinutes = keepAliveTimeInMinutes;
+        this.allowMaximumSizeToDivergeFromCoreSize = allowMaximumSizeToDivergeFromCoreSize;
         this.rollingCounterNumberOfBuckets = rollingCounterNumberOfBuckets;
         this.rollingCounterBucketSizeInMilliseconds = rollingCounterBucketSizeInMilliseconds;
     }
@@ -51,6 +53,7 @@ public static HystrixThreadPoolConfiguration sample(HystrixThreadPoolKey threadP
                 threadPoolProperties.maxQueueSize().get(),
                 threadPoolProperties.queueSizeRejectionThreshold().get(),
                 threadPoolProperties.keepAliveTimeMinutes().get(),
+                threadPoolProperties.getAllowMaximumSizeToDivergeFromCoreSize(),
                 threadPoolProperties.metricsRollingStatisticalWindowBuckets().get(),
                 threadPoolProperties.metricsRollingStatisticalWindowInMilliseconds().get());
     }
@@ -64,7 +67,11 @@ public int getCoreSize() {
     }
 
     public int getMaximumSize() {
-        return maximumSize;
+        if (allowMaximumSizeToDivergeFromCoreSize) {
+            return maximumSize;
+        } else {
+            return coreSize;
+        }
     }
 
     public int getMaxQueueSize() {
@@ -79,6 +86,10 @@ public int getKeepAliveTimeInMinutes() {
         return keepAliveTimeInMinutes;
     }
 
+    public boolean getAllowMaximumSizeToDivergeFromCoreSize() {
+        return allowMaximumSizeToDivergeFromCoreSize;
+    }
+
     public int getRollingCounterNumberOfBuckets() {
         return rollingCounterNumberOfBuckets;
     }

diff --git a/...ix-serialization/src/main/java/com/netflix/hystrix/serial/SerialHystrixConfiguration.java b/...ix-serialization/src/main/java/com/netflix/hystrix/serial/SerialHystrixConfiguration.java
@@ -181,6 +181,7 @@ public static HystrixConfiguration fromByteBuffer(ByteBuffer bb) {
                         threadPool.getValue().path("maxQueueSize").asInt(),
                         threadPool.getValue().path("queueRejectionThreshold").asInt(),
                         threadPool.getValue().path("keepAliveTimeInMinutes").asInt(),
+                        threadPool.getValue().path("allowMaximumSizeToDivergeFromCoreSize").asBoolean(),
                         threadPool.getValue().path("counterBucketCount").asInt(),
                         threadPool.getValue().path("counterBucketSizeInMilliseconds").asInt()
                 );
@@ -257,6 +258,7 @@ private static void writeThreadPoolConfigJson(JsonGenerator json, HystrixThreadP
         json.writeNumberField("maxQueueSize", threadPoolConfig.getMaxQueueSize());
         json.writeNumberField("queueRejectionThreshold", threadPoolConfig.getQueueRejectionThreshold());
         json.writeNumberField("keepAliveTimeInMinutes", threadPoolConfig.getKeepAliveTimeInMinutes());
+        json.writeBooleanField("allowMaximumSizeToDivergeFromCoreSize", threadPoolConfig.getAllowMaximumSizeToDivergeFromCoreSize());
         json.writeNumberField("counterBucketSizeInMilliseconds", threadPoolConfig.getRollingCounterBucketSizeInMilliseconds());
         json.writeNumberField("counterBucketCount", threadPoolConfig.getRollingCounterNumberOfBuckets());
         json.writeEndObject();