You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/07/08 23:15:05 UTC
[3/6] cassandra git commit: Can't transition from write survey to
normal mode
Can't transition from write survey to normal mode
patch by jasobrown; reviewed by driftx for CASSANDRA-9740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52dbc3f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52dbc3f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52dbc3f1
Branch: refs/heads/trunk
Commit: 52dbc3f1ba7a97654c305f4f9c4af008b450e9b0
Parents: 7cebd0e
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jul 8 14:11:12 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jul 8 14:11:12 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dbc3f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 27c26b0..84d562c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.17
+ * Can't transition from write survey to normal mode (CASSANDRA-9740)
* Avoid NPE in AuthSuccess#decode (CASSANDRA-9727)
* Add listen_address to system.local (CASSANDRA-9603)
* Bug fixes to resultset metadata construction (CASSANDRA-9636)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52dbc3f1/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 62b0c75..a256ce7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -907,7 +907,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public boolean isJoined()
{
- return joined;
+ return joined && !isSurveyMode;
}
public void rebuild(String sourceDc)