This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 55b463a216b6d5217e25a72ee993145c3280bcdd Merge: b30ebb9 0953f77 Author: Brandon Williams <[email protected]> AuthorDate: Mon Jan 13 15:13:53 2020 -0600 Merge branch 'cassandra-3.11' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index 709db58,4a6867c..b6d140c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,9 +1,25 @@@ -3.11.6 +4.0-alpha3 + * Improve error when JVM 11 can't access required modules (CASSANDRA-15468) + * Better handling of file deletion failures by DiskFailurePolicy (CASSANDRA-15143) + * Prevent read repair mutations from increasing read timeout (CASSANDRA-15442) + * Document 4.0 system keyspace changes, bump generations (CASSANDRA-15454) + * Make it possible to disable STCS-in-L0 during runtime (CASSANDRA-15445) + * Removed obsolete OldNetworkTopologyStrategy (CASSANDRA-13990) + * Align record header of FQL and audit binary log (CASSANDRA-15076) + * Shuffle forwarding replica for messages to non-local DC (CASSANDRA-15318) + * Optimise native protocol ASCII string encoding (CASSANDRA-15410) + * Make sure all exceptions are propagated in DebuggableThreadPoolExecutor (CASSANDRA-15332) + * Make it possible to resize concurrent read / write thread pools at runtime (CASSANDRA-15277) + * Close channels on error (CASSANDRA-15407) + * Add documentation for Java 11 support in Cassandra (CASSANDRA-15428) + * Integrate SJK into nodetool (CASSANDRA-12197) + * Ensure that empty clusterings with kind==CLUSTERING are Clustering.EMPTY (CASSANDRA-15498) +Merged from 3.11: * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409) * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075) - * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081) * Update nodetool help stop output (CASSANDRA-15401) Merged from 3.0: ++ * Fix race condition when setting bootstrap flags (CASSANDRA-14878) * Include updates to static column in mutation size calculations (CASSANDRA-15293) * Fix point-in-time recoevery ignoring timestamp of updates to static columns (CASSANDRA-15292) * GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306) diff --cc src/java/org/apache/cassandra/service/StorageService.java index 13cca3d,8466eb3..3588b1c --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1532,24 -1525,9 +1532,9 @@@ public class StorageService extends Not invalidateDiskBoundaries(); setMode(Mode.JOINING, "Starting to bootstrap...", true); - BootStrapper bootstrapper = new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, tokenMetadata); + BootStrapper bootstrapper = new BootStrapper(FBUtilities.getBroadcastAddressAndPort(), tokens, tokenMetadata); bootstrapper.addProgressListener(progressSupport); ListenableFuture<StreamState> bootstrapStream = bootstrapper.bootstrap(streamStateStore, useStrictConsistency && !replacing); // handles token update - Futures.addCallback(bootstrapStream, new FutureCallback<StreamState>() - { - @Override - public void onSuccess(StreamState streamState) - { - bootstrapFinished(); - logger.info("Bootstrap completed! for the tokens {}", tokens); - } - - @Override - public void onFailure(Throwable e) - { - logger.warn("Error during bootstrap.", e); - } - }, MoreExecutors.directExecutor()); try { bootstrapStream.get(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
