Add maximumSize to Hystrix Configuration stream

rwilliams-r7 · Oct 4, 2016 · 9d9f1ed · 9d9f1ed
1 parent c21d586
commit 9d9f1ed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
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
@@ -23,17 +23,19 @@ public class HystrixThreadPoolConfiguration {
     private static final String VERSION = "1";
     private final HystrixThreadPoolKey threadPoolKey;
     private final int coreSize;
+    private final int maximumSize;
     private final int maxQueueSize;
     private final int queueRejectionThreshold;
     private final int keepAliveTimeInMinutes;
     private final int rollingCounterNumberOfBuckets;
     private final int rollingCounterBucketSizeInMilliseconds;
 
-    public HystrixThreadPoolConfiguration(HystrixThreadPoolKey threadPoolKey, int coreSize, int maxQueueSize, int queueRejectionThreshold,
+    public HystrixThreadPoolConfiguration(HystrixThreadPoolKey threadPoolKey, int coreSize, int maximumSize, int maxQueueSize, int queueRejectionThreshold,
                                            int keepAliveTimeInMinutes, int rollingCounterNumberOfBuckets,
                                            int rollingCounterBucketSizeInMilliseconds) {
         this.threadPoolKey = threadPoolKey;
         this.coreSize = coreSize;
+        this.maximumSize = maximumSize;
         this.maxQueueSize = maxQueueSize;
         this.queueRejectionThreshold = queueRejectionThreshold;
         this.keepAliveTimeInMinutes = keepAliveTimeInMinutes;
@@ -45,6 +47,7 @@ public static HystrixThreadPoolConfiguration sample(HystrixThreadPoolKey threadP
         return new HystrixThreadPoolConfiguration(
                 threadPoolKey,
                 threadPoolProperties.coreSize().get(),
+                threadPoolProperties.maximumSize().get(),
                 threadPoolProperties.maxQueueSize().get(),
                 threadPoolProperties.queueSizeRejectionThreshold().get(),
                 threadPoolProperties.keepAliveTimeMinutes().get(),
@@ -60,6 +63,10 @@ public int getCoreSize() {
         return coreSize;
     }
 
+    public int getMaximumSize() {
+        return maximumSize;
+    }
+
     public int getMaxQueueSize() {
         return maxQueueSize;
     }

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
@@ -252,6 +252,7 @@ private static void writeCommandConfigJson(JsonGenerator json, HystrixCommandKey
     private static void writeThreadPoolConfigJson(JsonGenerator json, HystrixThreadPoolKey threadPoolKey, HystrixThreadPoolConfiguration threadPoolConfig) throws IOException {
         json.writeObjectFieldStart(threadPoolKey.name());
         json.writeNumberField("coreSize", threadPoolConfig.getCoreSize());
+        json.writeNumberField("maximumSize", threadPoolConfig.getMaximumSize());
         json.writeNumberField("maxQueueSize", threadPoolConfig.getMaxQueueSize());
         json.writeNumberField("queueRejectionThreshold", threadPoolConfig.getQueueRejectionThreshold());
         json.writeNumberField("keepAliveTimeInMinutes", threadPoolConfig.getKeepAliveTimeInMinutes());