Repository: incubator-blur Updated Branches: refs/heads/master 09d76298b -> 6dc0a83bf
Adding the cluster command manager to the shutdown process. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/74cdbb62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/74cdbb62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/74cdbb62 Branch: refs/heads/master Commit: 74cdbb620347b77578046ed9aa407b6db5e07fb6 Parents: 09d7629 Author: Aaron McCurry <[email protected]> Authored: Wed Sep 3 08:37:23 2014 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed Sep 3 08:37:23 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/blur/thrift/ThriftBlurControllerServer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/74cdbb62/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java index a22d372..c17235f 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/ThriftBlurControllerServer.java @@ -128,7 +128,7 @@ public class ThriftBlurControllerServer extends ThriftServer { int timeout = configuration.getInt(BLUR_CONTROLLER_SHARD_CONNECTION_TIMEOUT, 60000); BlurControllerServer.BlurClient client = new BlurControllerServer.BlurClientRemote(timeout); - ControllerCommandManager controllerCommandManager = new ControllerCommandManager(16); + final ControllerCommandManager controllerCommandManager = new ControllerCommandManager(16); final BlurControllerServer controllerServer = new BlurControllerServer(); controllerServer.setClient(client); @@ -206,7 +206,8 @@ public class ThriftBlurControllerServer extends ThriftServer { @Override public void shutdown() { ThreadWatcher threadWatcher = ThreadWatcher.instance(); - quietClose(traceStorage, server, controllerServer, clusterStatus, zooKeeper, threadWatcher, httpServer); + quietClose(controllerCommandManager, traceStorage, server, controllerServer, clusterStatus, zooKeeper, + threadWatcher, httpServer); } }; server.setShutdown(shutdown);
