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/12/19 01:40:24 UTC
[1/3] cassandra git commit: Emit MOVED_NODE topology event when a
node moves
Repository: cassandra
Updated Branches:
refs/heads/trunk 3f55c35b8 -> 507b6c029
Emit MOVED_NODE topology event when a node moves
Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8373
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8bce501
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8bce501
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8bce501
Branch: refs/heads/trunk
Commit: d8bce5017e1d1cdc96807ff5207706a0e150487f
Parents: 345e69e
Author: Adam Holmberg <ad...@datastax.com>
Authored: Thu Dec 18 18:38:35 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Dec 18 18:38:35 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8bce501/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d429f2e..bad24e7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.0.12:
+ * Fix MOVED_NODE topology event never being emitted when a node
+ moves its token (CASSANDRA-8373)
* Fix validation of indexes in COMPACT tables (CASSANDRA-8156)
* Avoid StackOverflowError when a large list of IN values
is used for a clustering column (CASSANDRA-8410)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8bce501/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 0456907..3daa66f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1605,6 +1605,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ boolean isMoving = tokenMetadata.isMoving(endpoint); // capture because updateNormalTokens clears moving status
tokenMetadata.updateNormalTokens(tokensToUpdateInMetadata, endpoint);
for (InetAddress ep : endpointsToRemove)
{
@@ -1617,7 +1618,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (!localTokensToRemove.isEmpty())
SystemKeyspace.updateLocalTokens(Collections.<Token>emptyList(), localTokensToRemove);
- if (tokenMetadata.isMoving(endpoint)) // if endpoint was moving to a new token
+ if (isMoving)
{
tokenMetadata.removeFromMoving(endpoint);
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/507b6c02
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/507b6c02
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/507b6c02
Branch: refs/heads/trunk
Commit: 507b6c0294b43a6cd6ca5d3c2117b8d3ad42fab2
Parents: 3f55c35 81d5d6e
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Dec 18 18:40:14 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Dec 18 18:40:14 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/507b6c02/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/507b6c02/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a349e64,cc23712..4d176e6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1601,11 -1650,15 +1602,11 @@@ public class StorageService extends Not
if (!localTokensToRemove.isEmpty())
SystemKeyspace.updateLocalTokens(Collections.<Token>emptyList(), localTokensToRemove);
- if (tokenMetadata.isMoving(endpoint)) // if endpoint was moving to a new token
+ if (isMoving)
{
tokenMetadata.removeFromMoving(endpoint);
-
- if (!isClientMode)
- {
- for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
- subscriber.onMove(endpoint);
- }
+ for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
+ subscriber.onMove(endpoint);
}
else
{
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ty...@apache.org.
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/81d5d6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81d5d6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81d5d6e2
Branch: refs/heads/trunk
Commit: 81d5d6e208b786b1a7a8e48c3b7a68346f1226b2
Parents: d2583ce d8bce50
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Dec 18 18:39:53 2014 -0600
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Dec 18 18:39:53 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81d5d6e2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index acf2fea,bad24e7..4586137
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,6 +1,44 @@@
-2.0.12:
+2.1.3
+ * (cqlsh) Fix compression options in DESCRIBE TABLE output when compression
+ is disabled (CASSANDRA-8288)
+ * (cqlsh) Fix DESCRIBE output after keyspaces are altered (CASSANDRA-7623)
+ * Make sure we set lastCompactedKey correctly (CASSANDRA-8463)
+ * (cqlsh) Fix output of CONSISTENCY command (CASSANDRA-8507)
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
+ * Make sstablescrub check leveled manifest again (CASSANDRA-8432)
+ * Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
+ * Disable mmap on Windows (CASSANDRA-6993)
+ * Add missing ConsistencyLevels to cassandra-stress (CASSANDRA-8253)
+ * Add auth support to cassandra-stress (CASSANDRA-7985)
+ * Fix ArrayIndexOutOfBoundsException when generating error message
+ for some CQL syntax errors (CASSANDRA-8455)
+ * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
+ * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
+ * Ensure memtable flush cannot expire commit log entries from its future (CASSANDRA-8383)
+ * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * Fix filtering for CONTAINS (KEY) relations on frozen collection
+ clustering columns when the query is restricted to a single
+ partition (CASSANDRA-8203)
+ * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243)
+ * Add more log info if readMeter is null (CASSANDRA-8238)
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Fix MOVED_NODE topology event never being emitted when a node
+ moves its token (CASSANDRA-8373)
* Fix validation of indexes in COMPACT tables (CASSANDRA-8156)
* Avoid StackOverflowError when a large list of IN values
is used for a clustering column (CASSANDRA-8410)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/81d5d6e2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------