Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 8952d6ca9 -> 6eec29ed8 refs/heads/cassandra-2.1 a8052d7c8 -> af863d7d4 refs/heads/trunk bc246e132 -> 624918988
Do not exit nodetool repair when receiving JMX NOTIF_LOST patch by yukim; reviewed by krummas for CASSANDRA-7909 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6eec29ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6eec29ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6eec29ed Branch: refs/heads/cassandra-2.0 Commit: 6eec29ed80de11e820dfcb0f3b3812553dd14246 Parents: 8952d6c Author: Yuki Morishita <[email protected]> Authored: Wed Sep 10 13:24:32 2014 -0700 Committer: Yuki Morishita <[email protected]> Committed: Mon Oct 6 13:05:20 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eec29ed/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9914ad9..66d7e72 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -34,6 +34,7 @@ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878) * Fix possible infinite loop in creating repair range (CASSANDRA-7983) * Fix unit in nodetool for streaming throughput (CASSANDRA-7375) + * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909) Merged from 1.2: * Don't index tombstones (CASSANDRA-7828) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6eec29ed/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index d281219..78dce76 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -1109,8 +1109,6 @@ class RepairRunner implements NotificationListener format.format(notification.getTimeStamp()), keyspace); out.println(message); - success = false; - condition.signalAll(); } else if (JMXConnectionNotification.FAILED.equals(notification.getType()) || JMXConnectionNotification.CLOSED.equals(notification.getType()))
