Repository: cassandra Updated Branches: refs/heads/cassandra-3.X 8f0d5a295 -> 49ce0a495 refs/heads/trunk 93a06b9ea -> 0919ae2c2
CASSANDRA-12836 Set JOINING mode when finishing joining ring Patch by Sergio Bossa; reviewed by Sam Tunnicliffe for CASSANDRA-12836 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49ce0a49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49ce0a49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49ce0a49 Branch: refs/heads/cassandra-3.X Commit: 49ce0a49571de31094959fa0f86da5492bd7fc0e Parents: 8f0d5a2 Author: Sergio Bossa <sergio.bo...@gmail.com> Authored: Tue Oct 25 10:28:56 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Oct 27 14:49:07 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49ce0a49/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 89c94dd..436b77b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Set JOINING mode when running pre-join tasks (CASSANDRA-12836) * remove net.mintern.primitive library due to license issue (CASSANDRA-12845) * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454) * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777) http://git-wip-us.apache.org/repos/asf/cassandra/blob/49ce0a49/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 1475570..4354c32 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1054,6 +1054,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE private void finishJoiningRing(boolean didBootstrap) { // start participating in the ring. + setMode(Mode.JOINING, "Finish joining ring", true); SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED); executePreJoinTasks(didBootstrap); setTokens(bootstrapTokens);
