You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2020/01/13 21:16:23 UTC

[cassandra] branch cassandra-3.11 updated (094180b -> 0953f77)

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 094180b  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 301168b  Fix race condition when setting bootstrap flags
     new 0953f77  Merge branch 'cassandra-3.0' into cassandra-3.11

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGES.txt                                             |  1 +
 .../org/apache/cassandra/service/StorageService.java    | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 0953f77fe535f96d7158fa9d076d37d9c2a9f93e
Merge: 094180b 301168b
Author: Brandon Williams <br...@datastax.com>
AuthorDate: Mon Jan 13 15:12:11 2020 -0600

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt                                             |  1 +
 .../org/apache/cassandra/service/StorageService.java    | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --cc CHANGES.txt
index 408048b,2edc399..4a6867c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,7 -14,8 +19,8 @@@ Merged from 3.0
   * Ensure that tracing doesn't break connections in 3.x/4.0 mixed mode by default (CASSANDRA-15385)
   * Make sure index summary redistribution does not start when compactions are paused (CASSANDRA-15265)
   * Ensure legacy rows have primary key livenessinfo when they contain illegal cells (CASSANDRA-15365)
+  * Fix race condition when setting bootstrap flags (CASSANDRA-14878)
 -Merged from 2.2
 +Merged from 2.2:
   * Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
   * In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
   * In-JVM DTest: Support NodeTool in dtest (CASSANDRA-15429)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index e7d97e9,f9efdb8..8466eb3
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1527,22 -1266,7 +1527,7 @@@ public class StorageService extends Not
          setMode(Mode.JOINING, "Starting to bootstrap...", true);
          BootStrapper bootstrapper = new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, tokenMetadata);
          bootstrapper.addProgressListener(progressSupport);
 -        ListenableFuture<StreamState> bootstrapStream = bootstrapper.bootstrap(streamStateStore, !replacing && useStrictConsistency); // handles token update
 +        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);
-             }
-         });
          try
          {
              bootstrapStream.get();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org