cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [03/15] cassandra git commit: Fix isJoined return true only after becoming cluster member
Date Fri, 22 Jan 2016 17:45:22 GMT
Fix isJoined return true only after becoming cluster member

patch by yukim; reviewed by tjake for CASANDRA-11007


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8408c76a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8408c76a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8408c76a

Branch: refs/heads/trunk
Commit: 8408c76aff1a5fbb7ea8984aaeced55c076b00a9
Parents: 3c55732
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Jan 22 10:46:43 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Jan 22 10:46:43 2016 -0600

----------------------------------------------------------------------
 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/8408c76a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4bff88c..e3e53d8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.13
+ * Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
  * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
  * Avoid NPE when incremental repair fails (CASSANDRA-10909)
  * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8408c76a/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 606670c..d8b1869 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1038,7 +1038,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
 
     public boolean isJoined()
     {
-        return joined && !isSurveyMode;
+        return tokenMetadata.isMember(FBUtilities.getBroadcastAddress());
     }
 
     public void rebuild(String sourceDc)


Mime
View raw message