You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2014/05/15 01:35:35 UTC
git commit: [HELIX-443] Race condition in Helix register/unregister
MessageHandlerFactory, rb=21248, fix typo
Repository: helix
Updated Branches:
refs/heads/helix-0.6.2-release 9661fd2f8 -> 6f4c5ffb3
[HELIX-443] Race condition in Helix register/unregister MessageHandlerFactory, rb=21248, fix typo
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/6f4c5ffb
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/6f4c5ffb
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/6f4c5ffb
Branch: refs/heads/helix-0.6.2-release
Commit: 6f4c5ffb3329c48b65b71aba095d1717b55281d9
Parents: 9661fd2
Author: zzhang <zz...@apache.org>
Authored: Wed May 14 16:28:30 2014 -0700
Committer: zzhang <zz...@apache.org>
Committed: Wed May 14 16:28:30 2014 -0700
----------------------------------------------------------------------
.../org/apache/helix/messaging/handling/HelixTaskExecutor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/6f4c5ffb/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
index a227eb3..2a18b54 100644
--- a/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
+++ b/helix-core/src/main/java/org/apache/helix/messaging/handling/HelixTaskExecutor.java
@@ -355,12 +355,12 @@ public class HelixTaskExecutor implements MessageListener, TaskExecutor {
pool.shutdown(); // Disable new tasks from being submitted
try {
// Wait a while for existing tasks to terminate
- if (!pool.awaitTermination(200, TimeUnit.MICROSECONDS)) {
+ if (!pool.awaitTermination(200, TimeUnit.MILLISECONDS)) {
List<Runnable> waitingTasks = pool.shutdownNow(); // Cancel currently executing tasks
LOG.info("Tasks that never commenced execution: " + waitingTasks);
// Wait a while for tasks to respond to being cancelled
- if (!pool.awaitTermination(200, TimeUnit.MICROSECONDS)) {
+ if (!pool.awaitTermination(200, TimeUnit.MILLISECONDS)) {
LOG.error("Pool did not fully terminate in 200ms. pool: " + pool);
}
}