Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03376209
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03376209
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03376209
Branch: refs/heads/trunk
Commit: 0337620994555930e4ff25ca201a3d59a04a1b17
Parents: 155eccd a6802aa
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Nov 11 11:40:47 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Nov 11 11:40:47 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/dht/RangeStreamer.java | 10 +++++-----
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03376209/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d868a2c,842643c..b1b5df8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,6 +1,9 @@@
-2.0.12:
+2.1.3
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries
(CASSANDRA-7801)
+Merged from 2.0:
+ * Include keyspace name in error message when there are insufficient
+ live nodes to stream from (CASSANDRA-8221)
* Avoid overlap in L1 when L0 contains many nonoverlapping
sstables (CASSANDRA-8211)
* Improve PropertyFileSnitch logging (CASSANDRA-8183)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03376209/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03376209/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a49dfc3,4bc1eee..29054f4
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3393,10 -3200,9 +3393,10 @@@ public class StorageService extends Not
}
// stream requests
- Multimap<InetAddress, Range<Token>> workMap =
RangeStreamer.getWorkMap(rangesToFetchWithPreferredEndpoints);
+ Multimap<InetAddress, Range<Token>> workMap =
RangeStreamer.getWorkMap(rangesToFetchWithPreferredEndpoints, keyspace);
for (InetAddress address : workMap.keySet())
{
+ logger.debug("Will request range {} of keyspace {}
from endpoint {}", workMap.get(address), keyspace, address);
InetAddress preferred =
SystemKeyspace.getPreferredIP(address);
streamPlan.requestRanges(address, preferred,
keyspace, workMap.get(address));
}
