Updated Branches: refs/heads/cassandra-1.1 94bcc6a6f -> 8e6962f01 refs/heads/trunk 22fbc4e41 -> afb2c00e5
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/afb2c00e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afb2c00e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afb2c00e Branch: refs/heads/trunk Commit: afb2c00e5864e9a7b60a1ff4b60740c321faee28 Parents: 4a6d988 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 2 12:53:21 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Aug 5 07:49:35 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/afb2c00e/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 2fd72cf..0fea181 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -644,7 +644,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"); } }
