storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [22/32] git commit: STORM-297: fix UT regression, when topology.workers is not specified.
Date Mon, 09 Jun 2014 13:48:27 GMT
STORM-297: fix UT regression, when topology.workers is not specified.


Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/20b4f8b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/20b4f8b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/20b4f8b2

Branch: refs/heads/master
Commit: 20b4f8b2195a1bf214f63e10b1bbca4690c0290f
Parents: 9f9a2a5
Author: Sean Zhong <clockfly@gmail.com>
Authored: Wed May 21 01:15:55 2014 +0800
Committer: Sean Zhong <clockfly@gmail.com>
Committed: Wed May 21 01:15:55 2014 +0800

----------------------------------------------------------------------
 storm-core/src/jvm/backtype/storm/messaging/netty/Context.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/20b4f8b2/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
index 8f2b17f..f592aff 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Context.java
@@ -63,7 +63,7 @@ public class Context implements IContext {
                     Executors.newCachedThreadPool(workerFactory));
         }
         
-        int otherWorkers = Utils.getInt(storm_conf.get(Config.TOPOLOGY_WORKERS)) - 1;
+        int otherWorkers = Utils.getInt(storm_conf.get(Config.TOPOLOGY_WORKERS), 1) - 1;
         int poolSize = Math.min(Math.max(1, otherWorkers), MAX_CLIENT_SCHEDULER_THREAD_POOL_SIZE);
         clientScheduleService = Executors.newScheduledThreadPool(poolSize, new NettyRenameThreadFactory("client-schedule-service"));
     }


Mime
View raw message