You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2014/11/19 05:42:33 UTC
[2/4] helix git commit: apply review comments
apply review comments
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/85e78d3f
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/85e78d3f
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/85e78d3f
Branch: refs/heads/helix-0.6.x
Commit: 85e78d3f51ed0c4d1db84fed5829920f382e3b0f
Parents: af882ea
Author: Antony T Curtis <ac...@linkedin.com>
Authored: Tue Nov 18 20:34:51 2014 -0800
Committer: Antony T Curtis <ac...@linkedin.com>
Committed: Tue Nov 18 20:34:51 2014 -0800
----------------------------------------------------------------------
.../org/apache/helix/controller/GenericHelixController.java | 6 +++---
.../main/java/org/apache/helix/manager/zk/ZKHelixManager.java | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/85e78d3f/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
index 5e5ad5b..1c59aab 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/GenericHelixController.java
@@ -84,6 +84,7 @@ public class GenericHelixController implements ConfigChangeListener, IdealStateC
LiveInstanceChangeListener, MessageListener, CurrentStateChangeListener,
ControllerChangeListener, InstanceConfigChangeListener {
private static final Logger logger = Logger.getLogger(GenericHelixController.class.getName());
+ private static final long EVENT_THREAD_JOIN_TIMEOUT = 1000;
volatile boolean init = false;
private final PipelineRegistry _registry;
@@ -575,10 +576,9 @@ public class GenericHelixController implements ConfigChangeListener, IdealStateC
public void shutdown() throws InterruptedException {
stopRebalancingTimer();
- while (_eventThread.isAlive())
- {
+ while (_eventThread.isAlive()) {
_eventThread.interrupt();
- _eventThread.join(1000);
+ _eventThread.join(EVENT_THREAD_JOIN_TIMEOUT);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/85e78d3f/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index b61c100..2c19396 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -558,8 +558,7 @@ public class ZKHelixManager implements HelixManager, IZkStateListener {
if (_controller != null) {
try {
_controller.shutdown();
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
LOG.info("Interrupted shutting down GenericHelixController", e);
}
finally {