fix awaitTermination logic for streamExecutors patch by Christopher Porter; reviewed by jbellis for CASSANDRA-4484
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e6962f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e6962f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e6962f0 Branch: refs/heads/trunk Commit: 8e6962f018aa9e5ec0ce38bd9c6ebbd972d8a515 Parents: 478248a Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 2 12:53:21 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Aug 2 12:53:21 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/net/MessagingService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e6962f0/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index e5be891..4f6aaf5 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -521,7 +521,7 @@ public final class MessagingService implements MessagingServiceMBean for (DebuggableThreadPoolExecutor e : streamExecutors.values()) { - if (e.awaitTermination(24, TimeUnit.HOURS)) + if (!e.awaitTermination(24, TimeUnit.HOURS)) logger_.error("Stream took more than 24H to complete; skipping"); } }
