You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/16 09:40:51 UTC
git commit: Fix streaming from all replica during boostrap/rebuild
Updated Branches:
refs/heads/cassandra-1.1 33199c6ca -> 271630d58
Fix streaming from all replica during boostrap/rebuild
patch by scode; reviewed by slebresne for CASSANDRA-3922
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/271630d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/271630d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/271630d5
Branch: refs/heads/cassandra-1.1
Commit: 271630d585a6f260cead493bca2fb7a1a6f8ea41
Parents: 33199c6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 16 09:38:46 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 16 09:40:13 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../org/apache/cassandra/dht/RangeStreamer.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/271630d5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 613c14e..6786c9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,7 +64,7 @@
* Allow extending CompositeType comparator (CASSANDRA-3657)
* Avoids over-paging during get_count (CASSANDRA-3798)
* Add new command to rebuild a node without (repair) merkle tree calculations
- (CASSANDRA-3483)
+ (CASSANDRA-3483, 3922)
* respect not only row cache capacity but caching mode when
trying to read data (CASSANDRA-3812)
* fix system tests (CASSANDRA-3827)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/271630d5/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index 9b2b41a..47931f8 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -189,6 +189,7 @@ public class RangeStreamer
rangeFetchMapMap.put(address, range);
foundSource = true;
+ break; // ensure we only stream from one other node for each range
}
if (!foundSource)