cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Date Tue, 13 Jun 2017 04:42:13 GMT
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: afd68abe60742c6deb6357ba4605268dfb3d06ea
Parents: 3e8f3c5 6220108
Author: mck <mck@apache.org>
Authored: Tue Jun 13 14:15:57 2017 +1000
Committer: mck <mck@apache.org>
Committed: Tue Jun 13 14:19:58 2017 +1000

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 .../cassandra/auth/CassandraRoleManager.java       |  4 ++++
 .../apache/cassandra/service/StorageService.java   | 17 +++++++++++------
 3 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 0591760,777ed05..433290e
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -39,7 -39,9 +39,8 @@@ import org.apache.cassandra.cql3.statem
  import org.apache.cassandra.db.ConsistencyLevel;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.exceptions.*;
 -import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.QueryState;
+ import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.transport.messages.ResultMessage;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.mindrot.jbcrypt.BCrypt;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 8914440,b4878c7..a7d4e9d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1032,13 -1083,16 +1034,16 @@@ public class StorageService extends Not
  
      private void doAuthSetup()
      {
-         maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+         if (!authSetupCalled.getAndSet(true))
+         {
+             maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
  
-         DatabaseDescriptor.getRoleManager().setup();
-         DatabaseDescriptor.getAuthenticator().setup();
-         DatabaseDescriptor.getAuthorizer().setup();
-         Schema.instance.registerListener(new AuthSchemaChangeListener());
-         authSetupComplete = true;
+             DatabaseDescriptor.getRoleManager().setup();
+             DatabaseDescriptor.getAuthenticator().setup();
+             DatabaseDescriptor.getAuthorizer().setup();
 -            MigrationManager.instance.register(new AuthMigrationListener());
++            Schema.instance.registerListener(new AuthSchemaChangeListener());
+             authSetupComplete = true;
+         }
      }
  
      public boolean isAuthSetupComplete()


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


Mime
View raw message