You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/08/27 18:03:28 UTC
[1/2] git commit: Fix failure to stream ranges when moving
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 44a9d8cc6 -> 4327c29be
Fix failure to stream ranges when moving
Patch by Tyler Hobbs; reviewed by Yuki Morishita for CASSANDRA-7836
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b3afb35
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b3afb35
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b3afb35
Branch: refs/heads/cassandra-2.1
Commit: 3b3afb35cd20636c937ab953f497ee7193ab1ffc
Parents: ce3fcbe
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Aug 27 11:02:24 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Aug 27 11:02:24 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 ++++++++++
src/java/org/apache/cassandra/streaming/StreamPlan.java | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3afb35/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c75426..0b45cef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0
+ * Fix failure to stream ranges when moving (CASSANDRA-7836)
* Correctly remove tmplink files (CASSANDRA-7803)
* (cqlsh) Fix column name formatting for functions, CAS operations,
and UDT field selections (CASSANDRA-7806)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3afb35/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index b4aa5ba..735bf7b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3179,6 +3179,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
for (String keyspace : keyspaceNames)
{
+ logger.debug("Calculating ranges to stream and request for keyspace {}", keyspace);
for (Token newToken : newTokens)
{
// replication strategy of the current keyspace (aka table)
@@ -3263,17 +3264,26 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
Set<InetAddress> newEndpoints = ImmutableSet.copyOf(strategy.calculateNaturalEndpoints(toStream.right, tokenMetaCloneAllSettled));
logger.debug("Range: {} Current endpoints: {} New endpoints: {}", toStream, currentEndpoints, newEndpoints);
for (InetAddress address : Sets.difference(newEndpoints, currentEndpoints))
+ {
+ logger.debug("Range {} has new owner {}", toStream, address);
endpointRanges.put(address, toStream);
+ }
}
// stream ranges
for (InetAddress address : endpointRanges.keySet())
+ {
+ logger.debug("Will stream range {} of keyspace {} to endpoint {}", endpointRanges.get(address), keyspace, address);
streamPlan.transferRanges(address, keyspace, endpointRanges.get(address));
+ }
// stream requests
Multimap<InetAddress, Range<Token>> workMap = RangeStreamer.getWorkMap(rangesToFetchWithPreferredEndpoints);
for (InetAddress address : workMap.keySet())
+ {
+ logger.debug("Will request range {} of keyspace {} from endpoint {}", workMap.get(address), keyspace, address);
streamPlan.requestRanges(address, keyspace, workMap.get(address));
+ }
if (logger.isDebugEnabled())
logger.debug("Keyspace {}: work map {}.", keyspace, workMap);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b3afb35/src/java/org/apache/cassandra/streaming/StreamPlan.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamPlan.java b/src/java/org/apache/cassandra/streaming/StreamPlan.java
index e775c90..feb116f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamPlan.java
+++ b/src/java/org/apache/cassandra/streaming/StreamPlan.java
@@ -143,7 +143,7 @@ public class StreamPlan
*/
public boolean isEmpty()
{
- return coordinator.hasActiveSessions();
+ return !coordinator.hasActiveSessions();
}
/**
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4327c29b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4327c29b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4327c29b
Branch: refs/heads/cassandra-2.1
Commit: 4327c29be80847aef2c772dbf2f3a6bc2e8986e0
Parents: 44a9d8c 3b3afb3
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Aug 27 11:03:10 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Aug 27 11:03:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 10 ++++++++++
src/java/org/apache/cassandra/streaming/StreamPlan.java | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4327c29b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b2b4a5a,0b45cef..979b017
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,5 +1,53 @@@
+2.1.1
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Don't send schema change responses and events for no-op DDL
+ statements (CASSANDRA-7600)
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
+ * Throw InvalidRequestException when queries contain relations on entire
+ collection columns (CASSANDRA-7506)
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+Merged from 1.2:
+ * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
+
+
2.1.0
+ * Fix failure to stream ranges when moving (CASSANDRA-7836)
* Correctly remove tmplink files (CASSANDRA-7803)
* (cqlsh) Fix column name formatting for functions, CAS operations,
and UDT field selections (CASSANDRA-7806)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4327c29b/src/java/org/apache/cassandra/streaming/StreamPlan.java
----------------------------------------------------------------------