You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ca...@apache.org on 2016/12/05 17:28:53 UTC
[1/8] cassandra git commit: Use saved tokens when setting local
tokens on StorageService.joinRing()
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 a06b469c6 -> a85b00710
refs/heads/cassandra-3.X caa26e4fb -> 09da51e66
refs/heads/trunk d31ce663f -> 8d97e3d9b
Use saved tokens when setting local tokens on StorageService.joinRing()
Patch by Paulo Motta; reviewed by Carl Yeksigian for CASSANDRA-12935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a449e8f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a449e8f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a449e8f7
Branch: refs/heads/cassandra-3.11
Commit: a449e8f70f047081b2fd5892219ad2659d0027bd
Parents: d38bf9f
Author: Paulo Motta <pa...@gmail.com>
Authored: Sun Nov 20 18:47:54 2016 -0200
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 11:40:37 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a449e8f7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d951b07..302becf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
* cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
* Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
* Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a449e8f7/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 58c2bac..c2996d7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -194,6 +194,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
/** This method updates the local token on disk */
public void setTokens(Collection<Token> tokens)
{
+ assert tokens != null && !tokens.isEmpty() : "Node needs at least one token.";
if (logger.isDebugEnabled())
logger.debug("Setting tokens to {}", tokens);
SystemKeyspace.updateTokens(tokens);
@@ -907,7 +908,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
if (dataAvailable)
{
- finishJoiningRing();
+ finishJoiningRing(bootstrapTokens);
// remove the existing info about the replaced node.
if (!current.isEmpty())
@@ -959,15 +960,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
isSurveyMode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
- finishJoiningRing();
+ finishJoiningRing(SystemKeyspace.getSavedTokens());
}
}
- private void finishJoiningRing()
+ private void finishJoiningRing(Collection<Token> tokens)
{
// start participating in the ring.
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
- setTokens(bootstrapTokens);
+ setTokens(tokens);
assert tokenMetadata.sortedTokens().size() > 0;
doAuthSetup();
[4/8] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ca...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85b0071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85b0071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a85b0071
Branch: refs/heads/cassandra-3.X
Commit: a85b007103ec2ffcfac2ce9e591bc26657089549
Parents: a06b469 5f64ed7
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:27:57 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:27:57 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e69a67a,5cacdd0..c04c2fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -163,9 -48,6 +163,10 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 07eb1d8,9bf8c54..a53187f
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -986,7 -917,8 +987,7 @@@ public class StorageService extends Not
{
if (dataAvailable)
{
- finishJoiningRing(bootstrap);
- finishJoiningRing(bootstrapTokens);
-
++ finishJoiningRing(bootstrap, bootstrapTokens);
// remove the existing info about the replaced node.
if (!current.isEmpty())
{
@@@ -1041,26 -967,17 +1042,26 @@@
}
else if (isSurveyMode)
{
- isSurveyMode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
- finishJoiningRing(resumedBootstrap);
- finishJoiningRing(SystemKeyspace.getSavedTokens());
++ finishJoiningRing(resumedBootstrap, SystemKeyspace.getSavedTokens());
+ isSurveyMode = false;
}
}
- private void finishJoiningRing(Collection<Token> tokens)
+ private void executePreJoinTasks(boolean bootstrap)
+ {
+ StreamSupport.stream(ColumnFamilyStore.all().spliterator(), false)
+ .filter(cfs -> Schema.instance.getUserKeyspaces().contains(cfs.keyspace.getName()))
+ .forEach(cfs -> cfs.indexManager.executePreJoinTasksBlocking(bootstrap));
+ }
+
- private void finishJoiningRing(boolean didBootstrap)
++ private void finishJoiningRing(boolean didBootstrap, Collection<Token> tokens)
{
// start participating in the ring.
+ setMode(Mode.JOINING, "Finish joining ring", true);
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
+ executePreJoinTasks(didBootstrap);
- setTokens(bootstrapTokens);
+ setTokens(tokens);
assert tokenMetadata.sortedTokens().size() > 0;
doAuthSetup();
[2/8] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ca...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f64ed7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f64ed7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f64ed7c
Branch: refs/heads/cassandra-3.11
Commit: 5f64ed7cc2d62543f0be7b5eb09bd2495a0e4f3a
Parents: 4d5a53e a449e8f
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 11:41:52 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 11:41:52 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f64ed7c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8cdca57,302becf..5cacdd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-2.2.9
+3.0.11
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
* cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
* Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
* Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f64ed7c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[7/8] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by ca...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09da51e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09da51e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09da51e6
Branch: refs/heads/cassandra-3.X
Commit: 09da51e66bd30a8696c39cd21c1261e35c531059
Parents: caa26e4 a85b007
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:28:09 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:28:09 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[6/8] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by ca...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09da51e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09da51e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09da51e6
Branch: refs/heads/trunk
Commit: 09da51e66bd30a8696c39cd21c1261e35c531059
Parents: caa26e4 a85b007
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:28:09 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:28:09 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[8/8] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by ca...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d97e3d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d97e3d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d97e3d9
Branch: refs/heads/trunk
Commit: 8d97e3d9b615e3ebf006156d93e03448b84247cd
Parents: d31ce66 09da51e
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:28:25 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:28:25 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/8] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ca...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85b0071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85b0071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a85b0071
Branch: refs/heads/trunk
Commit: a85b007103ec2ffcfac2ce9e591bc26657089549
Parents: a06b469 5f64ed7
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:27:57 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:27:57 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e69a67a,5cacdd0..c04c2fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -163,9 -48,6 +163,10 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 07eb1d8,9bf8c54..a53187f
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -986,7 -917,8 +987,7 @@@ public class StorageService extends Not
{
if (dataAvailable)
{
- finishJoiningRing(bootstrap);
- finishJoiningRing(bootstrapTokens);
-
++ finishJoiningRing(bootstrap, bootstrapTokens);
// remove the existing info about the replaced node.
if (!current.isEmpty())
{
@@@ -1041,26 -967,17 +1042,26 @@@
}
else if (isSurveyMode)
{
- isSurveyMode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
- finishJoiningRing(resumedBootstrap);
- finishJoiningRing(SystemKeyspace.getSavedTokens());
++ finishJoiningRing(resumedBootstrap, SystemKeyspace.getSavedTokens());
+ isSurveyMode = false;
}
}
- private void finishJoiningRing(Collection<Token> tokens)
+ private void executePreJoinTasks(boolean bootstrap)
+ {
+ StreamSupport.stream(ColumnFamilyStore.all().spliterator(), false)
+ .filter(cfs -> Schema.instance.getUserKeyspaces().contains(cfs.keyspace.getName()))
+ .forEach(cfs -> cfs.indexManager.executePreJoinTasksBlocking(bootstrap));
+ }
+
- private void finishJoiningRing(boolean didBootstrap)
++ private void finishJoiningRing(boolean didBootstrap, Collection<Token> tokens)
{
// start participating in the ring.
+ setMode(Mode.JOINING, "Finish joining ring", true);
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
+ executePreJoinTasks(didBootstrap);
- setTokens(bootstrapTokens);
+ setTokens(tokens);
assert tokenMetadata.sortedTokens().size() > 0;
doAuthSetup();
[3/8] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ca...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85b0071
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85b0071
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a85b0071
Branch: refs/heads/cassandra-3.11
Commit: a85b007103ec2ffcfac2ce9e591bc26657089549
Parents: a06b469 5f64ed7
Author: Carl Yeksigian <ca...@apache.org>
Authored: Mon Dec 5 12:27:57 2016 -0500
Committer: Carl Yeksigian <ca...@apache.org>
Committed: Mon Dec 5 12:27:57 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e69a67a,5cacdd0..c04c2fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -163,9 -48,6 +163,10 @@@ Merged from 3.0
* Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
* Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
Merged from 2.2:
++ * Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
+ * cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
+ * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
* Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
* Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
* cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85b0071/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 07eb1d8,9bf8c54..a53187f
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -986,7 -917,8 +987,7 @@@ public class StorageService extends Not
{
if (dataAvailable)
{
- finishJoiningRing(bootstrap);
- finishJoiningRing(bootstrapTokens);
-
++ finishJoiningRing(bootstrap, bootstrapTokens);
// remove the existing info about the replaced node.
if (!current.isEmpty())
{
@@@ -1041,26 -967,17 +1042,26 @@@
}
else if (isSurveyMode)
{
- isSurveyMode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
- finishJoiningRing(resumedBootstrap);
- finishJoiningRing(SystemKeyspace.getSavedTokens());
++ finishJoiningRing(resumedBootstrap, SystemKeyspace.getSavedTokens());
+ isSurveyMode = false;
}
}
- private void finishJoiningRing(Collection<Token> tokens)
+ private void executePreJoinTasks(boolean bootstrap)
+ {
+ StreamSupport.stream(ColumnFamilyStore.all().spliterator(), false)
+ .filter(cfs -> Schema.instance.getUserKeyspaces().contains(cfs.keyspace.getName()))
+ .forEach(cfs -> cfs.indexManager.executePreJoinTasksBlocking(bootstrap));
+ }
+
- private void finishJoiningRing(boolean didBootstrap)
++ private void finishJoiningRing(boolean didBootstrap, Collection<Token> tokens)
{
// start participating in the ring.
+ setMode(Mode.JOINING, "Finish joining ring", true);
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
+ executePreJoinTasks(didBootstrap);
- setTokens(bootstrapTokens);
+ setTokens(tokens);
assert tokenMetadata.sortedTokens().size() > 0;
doAuthSetup();