You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/26 23:16:51 UTC
cassandra git commit: Fix race on StorageService.doAuthSetup
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 bb77e12f0 -> 88b05ef4b
Fix race on StorageService.doAuthSetup
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b05ef4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b05ef4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b05ef4
Branch: refs/heads/cassandra-3.0
Commit: 88b05ef4b01bda523ea93211e30401df4d040fdd
Parents: bb77e12
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed Aug 26 17:15:33 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Aug 26 17:15:33 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b05ef4/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 0346645..a6c2f8b 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
// Also, the addKeyspace above can be racy if multiple nodes are started
// concurrently - see CASSANDRA-9201
for (CFMetaData table : AuthKeyspace.metadata().tables)
- if (Schema.instance.getCFMetaData(table.ksName, table.cfName) == null)
+ if (Schema.instance.getCF(table.cfId) == null)
maybeAddTable(table);
DatabaseDescriptor.getRoleManager().setup();