This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a63df4de3e64c5aeaafa1cf147e512051c060764
Merge: d0e0e02 39a431d
Author: Blake Eggleston <bdeggles...@gmail.com>
AuthorDate: Mon Oct 7 11:33:17 2019 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --cc CHANGES.txt
index 11a7234,ca6ea2e..3544594
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
-3.0.19
+3.11.5
+ * Make sure user defined compaction transactions are always closed
(CASSANDRA-15123)
+ * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config
(CASSANDRA-14305)
+ * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
+ * Add flag to disable SASI indexes, and warnings on creation
(CASSANDRA-14866)
+Merged from 3.0:
+ * Gossip tokens on startup if available (CASSANDRA-15335)
* Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340)
- * Fix merge which reverted CASSANDRA-14993 (CASSANDRA-15289)
+ * Fix bad merge that reverted CASSANDRA-14993 (CASSANDRA-15289)
* Fix LegacyLayout RangeTombstoneList IndexOutOfBoundsException when
upgrading and RangeTombstone bounds are asymmetric (CASSANDRA-15172)
* Fix NPE when using allocate_tokens_for_keyspace on new DC/rack
(CASSANDRA-14952)
* Filter sstables earlier when running cleanup (CASSANDRA-15100)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 000c2fb,2af7fb7..346f9a4
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -55,9 -57,9 +56,10 @@@ import org.apache.cassandra.concurrent.
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.SchemaConstants;
import org.apache.cassandra.config.ViewDefinition;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.commitlog.CommitLog;
@@@ -819,9 -764,19 +821,18 @@@ public class StorageService extends Not
appStates.put(ApplicationState.STATUS,
valueFactory.hibernate(true));
}
}
- else if (shouldBootstrap())
- {
- checkForEndpointCollision();
- }
- else if (SystemKeyspace.bootstrapComplete())
+ else
{
- Preconditions.checkState(!Config.isClientMode());
- // tokens are only ever saved to system.local after bootstrap
has completed and we're joining the ring,
- // or when token update operations (move, decom) are completed
- Collection<Token> savedTokens =
SystemKeyspace.getSavedTokens();
- if (!savedTokens.isEmpty())
- appStates.put(ApplicationState.TOKENS,
valueFactory.tokens(savedTokens));
+ checkForEndpointCollision(localHostId,
SystemKeyspace.loadHostIds().keySet());
++ if (SystemKeyspace.bootstrapComplete())
++ {
++ Preconditions.checkState(!Config.isClientMode());
++ // tokens are only ever saved to system.local after
bootstrap has completed and we're joining the ring,
++ // or when token update operations (move, decom) are
completed
++ Collection<Token> savedTokens =
SystemKeyspace.getSavedTokens();
++ if (!savedTokens.isEmpty())
++ appStates.put(ApplicationState.TOKENS,
valueFactory.tokens(savedTokens));
++ }
}
// have to start the gossip service before we can see any info on
other nodes. this is necessary
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
