Repository: storm Updated Branches: refs/heads/1.x-branch 63bac16c2 -> 7c534bd69
STORM-1569: Adding option in nimbus to specify request queue size in config. Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/31985cc0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/31985cc0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/31985cc0 Branch: refs/heads/1.x-branch Commit: 31985cc09537534ed8179446b6493c947e741a48 Parents: 63bac16 Author: Parth Brahmbhatt <brahmbhatt.pa...@gmail.com> Authored: Tue Feb 23 10:28:05 2016 -0800 Committer: Kyle Nusbaum <kylejnusb...@gmail.com> Committed: Wed Feb 24 15:34:37 2016 -0600 ---------------------------------------------------------------------- conf/defaults.yaml | 2 +- storm-core/src/jvm/org/apache/storm/Config.java | 9 +++++++++ .../apache/storm/security/auth/ThriftConnectionType.java | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/31985cc0/conf/defaults.yaml ---------------------------------------------------------------------- diff --git a/conf/defaults.yaml b/conf/defaults.yaml index d381f0d..7128cfe 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -77,7 +77,7 @@ topology.min.replication.count: 1 topology.max.replication.wait.time.sec: 60 nimbus.credential.renewers.freq.secs: 600 nimbus.impersonation.authorizer: "org.apache.storm.security.auth.authorizer.ImpersonationAuthorizer" - +nimbus.queue.size: 100000 scheduler.display.resource: false ### ui.* configs are for the master http://git-wip-us.apache.org/repos/asf/storm/blob/31985cc0/storm-core/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java index 74231a0..3eedc63 100644 --- a/storm-core/src/jvm/org/apache/storm/Config.java +++ b/storm-core/src/jvm/org/apache/storm/Config.java @@ -675,6 +675,15 @@ public class Config extends HashMap<String, Object> { public static final String NIMBUS_AUTO_CRED_PLUGINS = "nimbus.autocredential.plugins.classes"; /** + * Nimbus thrift server queue size, default is 100000. This is the request queue size , when there are more requests + * than number of threads to serve the requests, those requests will be queued to this queue. If the request queue + * size > this config, then the incoming requests will be rejected. + */ + @isInteger + @isPositiveNumber + public static final String NIMBUS_QUEUE_SIZE = "nimbus.queue.size"; + + /** * FQCN of a class that implements {@code ISubmitterHook} @see ISubmitterHook for details. */ http://git-wip-us.apache.org/repos/asf/storm/blob/31985cc0/storm-core/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java b/storm-core/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java index 6d05a8a..27db143 100644 --- a/storm-core/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java +++ b/storm-core/src/jvm/org/apache/storm/security/auth/ThriftConnectionType.java @@ -26,7 +26,7 @@ import java.util.Map; * The purpose for which the Thrift server is created. */ public enum ThriftConnectionType { - NIMBUS(Config.NIMBUS_THRIFT_TRANSPORT_PLUGIN, Config.NIMBUS_THRIFT_PORT, null, + NIMBUS(Config.NIMBUS_THRIFT_TRANSPORT_PLUGIN, Config.NIMBUS_THRIFT_PORT, Config.NIMBUS_QUEUE_SIZE, Config.NIMBUS_THRIFT_THREADS, Config.NIMBUS_THRIFT_MAX_BUFFER_SIZE), DRPC(Config.DRPC_THRIFT_TRANSPORT_PLUGIN, Config.DRPC_PORT, Config.DRPC_QUEUE_SIZE, Config.DRPC_WORKER_THREADS, Config.DRPC_MAX_BUFFER_SIZE),
