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:22 UTC
[cassandra] branch cassandra-3.0 updated: Fix race condition when
setting bootstrap flags
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.0 by this push:
new 301168b Fix race condition when setting bootstrap flags
301168b is described below
commit 301168b60331bbd01864265a02fce9b63b94b823
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Thu Jan 2 07:35:51 2020 -0500
Fix race condition when setting bootstrap flags
Patch by Ekaterina Dimitrova, reviewed by brandonwilliams for CASSANDRA-14878
---
CHANGES.txt | 1 +
.../org/apache/cassandra/service/StorageService.java | 17 ++---------------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 620eb35..2edc399 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
* 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
* Fix SELECT JSON output for empty blobs (CASSANDRA-15435)
* In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 9f5cd2b..f9efdb8 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1267,24 +1267,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
BootStrapper bootstrapper = new BootStrapper(FBUtilities.getBroadcastAddress(), tokens, tokenMetadata);
bootstrapper.addProgressListener(progressSupport);
ListenableFuture<StreamState> bootstrapStream = bootstrapper.bootstrap(streamStateStore, !replacing && useStrictConsistency); // 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();
+ bootstrapFinished();
+ logger.info("Bootstrap completed for tokens {}", tokens);
return true;
}
catch (Throwable e)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org