You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2017/06/13 04:42:04 UTC
[01/10] cassandra git commit: Node running with join_ring=false and
authentication can not serve requests
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 5807eca8b -> f49579df3
refs/heads/cassandra-3.0 40ad3cf4d -> 7b9868ce2
refs/heads/cassandra-3.11 30412b08c -> 6220108e6
refs/heads/trunk 3e8f3c5ed -> afd68abe6
Node running with join_ring=false and authentication can not serve requests
patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f49579df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49579df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49579df
Branch: refs/heads/cassandra-2.2
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <mc...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <mi...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ 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;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
*/
private static void setupDefaultRole()
{
+ if (StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+ throw new IllegalStateException("CassandraRoleManager skipped default role setup: no known tokens in ring");
+
try
{
if (!hasExistingRoles())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/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 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private final StreamStateStore streamStateStore = new StreamStateStore();
+ private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
/** This method updates the local token on disk */
public void setTokens(Collection<Token> tokens)
{
@@ -657,6 +659,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
}
@@ -974,12 +977,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+ if (!doneAuthSetup.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
private void maybeAddKeyspace(KSMetaData ksm)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by mc...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6220108e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6220108e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6220108e
Branch: refs/heads/trunk
Commit: 6220108e687e28b05d7cb0bbd254751f51a0f1d7
Parents: 30412b0 7b9868c
Author: mck <mc...@apache.org>
Authored: Tue Jun 13 14:11:15 2017 +1000
Committer: mck <mc...@apache.org>
Committed: Tue Jun 13 14:15:03 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/6220108e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ffa526,26462db..f285ff0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,34 -40,12 +74,35 @@@ Merged from 3.0
* Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
- * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)
+ * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
+ * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071)
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+ * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
+ * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
+ * Hint related logging should include the IP address of the destination in addition to
+ host ID (CASSANDRA-13205)
+ * Reloading logback.xml does not work (CASSANDRA-13173)
+ * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
+ * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
+ * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
+ * Fix handling of partition with partition-level deletion plus
+ live rows in sstabledump (CASSANDRA-13177)
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
- * Fix NPE issue in StorageService (CASSANDRA-13060)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
Merged from 2.2:
++ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
+ * cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 749c6a9,3bad040..b4878c7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -190,12 -177,10 +190,13 @@@ public class StorageService extends Not
private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
/* true if node is rebuilding and receiving data */
private final AtomicBoolean isRebuilding = new AtomicBoolean();
+ private final AtomicBoolean isDecommissioning = new AtomicBoolean();
- private boolean initialized;
+ private volatile boolean initialized = false;
private volatile boolean joined = false;
+ private volatile boolean gossipActive = false;
+ private final AtomicBoolean authSetupCalled = new AtomicBoolean(false);
+ private volatile boolean authSetupComplete = false;
/* the probability for tracing any particular request, 0 disables tracing and 1 enables for all */
private double traceProbability = 0.0;
@@@ -691,44 -668,9 +692,45 @@@
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
+
+ initialized = true;
+ }
+
+ private void loadRingState()
+ {
+ if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true")))
+ {
+ logger.info("Loading persisted ring state");
+ Multimap<InetAddress, Token> loadedTokens = SystemKeyspace.loadTokens();
+ Map<InetAddress, UUID> loadedHostIds = SystemKeyspace.loadHostIds();
+ for (InetAddress ep : loadedTokens.keySet())
+ {
+ if (ep.equals(FBUtilities.getBroadcastAddress()))
+ {
+ // entry has been mistakenly added, delete it
+ SystemKeyspace.removeEndpoint(ep);
+ }
+ else
+ {
+ if (loadedHostIds.containsKey(ep))
+ tokenMetadata.updateHostId(loadedHostIds.get(ep), ep);
+ Gossiper.instance.addSavedEndpoint(ep);
+ }
+ }
+ }
+ }
+
+ private boolean isReplacing()
+ {
+ if (System.getProperty("cassandra.replace_address_first_boot", null) != null && SystemKeyspace.bootstrapComplete())
+ {
+ logger.info("Replace address on first boot requested; this node is already bootstrapped");
+ return false;
+ }
+ return DatabaseDescriptor.getReplaceAddress() != null;
}
/**
@@@ -1081,20 -997,18 +1083,23 @@@
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+ if (!authSetupCalled.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
- authSetupComplete = true;
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
-
+ MigrationManager.instance.register(new AuthMigrationListener());
++ authSetupComplete = true;
+ }
}
+ public boolean isAuthSetupComplete()
+ {
+ return authSetupComplete;
+ }
+
private void maybeAddKeyspace(KeyspaceMetadata ksm)
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b9868ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b9868ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b9868ce
Branch: refs/heads/trunk
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <mc...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <mc...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
-2.2.10
+3.0.14
+ * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
+ * Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
+ * Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
+ * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+ * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
+ * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade (CASSANDRA-13525)
+ * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052)
+ * Add storage port options to sstableloader (CASSANDRA-13518)
+ * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847)
+ * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
+ * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
+ * Fail repair if insufficient responses received (CASSANDRA-13397)
+ * Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
+ * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
+ * Handling partially written hint files (CASSANDRA-12728)
+ * Interrupt replaying hints on decommission (CASSANDRA-13308)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
+Merged from 2.2:
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
- * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
+
+3.0.13
+ * Make reading of range tombstones more reliable (CASSANDRA-12811)
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9bc046f,9d2d7bb..3bad040
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -180,6 -162,6 +180,7 @@@ public class StorageService extends Not
private boolean initialized;
private volatile boolean joined = false;
++ private final AtomicBoolean authSetupCalled = new AtomicBoolean(false);
/* the probability for tracing any particular request, 0 disables tracing and 1 enables for all */
private double traceProbability = 0.0;
@@@ -995,15 -977,18 +997,19 @@@
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
- if (!doneAuthSetup.getAndSet(true))
++ if (!authSetupCalled.getAndSet(true))
+ {
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
++ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
- private void maybeAddKeyspace(KSMetaData ksm)
+ private void maybeAddKeyspace(KeyspaceMetadata ksm)
{
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by mc...@apache.org.
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 <mc...@apache.org>
Authored: Tue Jun 13 14:15:57 2017 +1000
Committer: mck <mc...@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
[03/10] cassandra git commit: Node running with join_ring=false and
authentication can not serve requests
Posted by mc...@apache.org.
Node running with join_ring=false and authentication can not serve requests
patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f49579df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49579df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49579df
Branch: refs/heads/cassandra-3.11
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <mc...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <mi...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ 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;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
*/
private static void setupDefaultRole()
{
+ if (StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+ throw new IllegalStateException("CassandraRoleManager skipped default role setup: no known tokens in ring");
+
try
{
if (!hasExistingRoles())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/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 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private final StreamStateStore streamStateStore = new StreamStateStore();
+ private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
/** This method updates the local token on disk */
public void setTokens(Collection<Token> tokens)
{
@@ -657,6 +659,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
}
@@ -974,12 +977,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+ if (!doneAuthSetup.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
private void maybeAddKeyspace(KSMetaData ksm)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[04/10] cassandra git commit: Node running with join_ring=false and
authentication can not serve requests
Posted by mc...@apache.org.
Node running with join_ring=false and authentication can not serve requests
patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f49579df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49579df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49579df
Branch: refs/heads/trunk
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <mc...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <mi...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ 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;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
*/
private static void setupDefaultRole()
{
+ if (StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+ throw new IllegalStateException("CassandraRoleManager skipped default role setup: no known tokens in ring");
+
try
{
if (!hasExistingRoles())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/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 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private final StreamStateStore streamStateStore = new StreamStateStore();
+ private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
/** This method updates the local token on disk */
public void setTokens(Collection<Token> tokens)
{
@@ -657,6 +659,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
}
@@ -974,12 +977,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+ if (!doneAuthSetup.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
private void maybeAddKeyspace(KSMetaData ksm)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[02/10] cassandra git commit: Node running with join_ring=false and
authentication can not serve requests
Posted by mc...@apache.org.
Node running with join_ring=false and authentication can not serve requests
patch by Mick Semb Wever; reviewed by Joel Knighton for CASSANDRA-11381
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f49579df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f49579df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f49579df
Branch: refs/heads/cassandra-3.0
Commit: f49579df38121f88107531307437b447a7438cda
Parents: 5807eca
Author: mck <mc...@apache.org>
Authored: Fri Mar 18 14:22:32 2016 +1100
Committer: mck <mi...@thelastpickle.com>
Committed: Tue Jun 13 13:57:17 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d00ddcb..56890c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 87aca21..bfd0483 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -40,6 +40,7 @@ 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;
@@ -344,6 +345,9 @@ public class CassandraRoleManager implements IRoleManager
*/
private static void setupDefaultRole()
{
+ if (StorageService.instance.getTokenMetadata().sortedTokens().isEmpty())
+ throw new IllegalStateException("CassandraRoleManager skipped default role setup: no known tokens in ring");
+
try
{
if (!hasExistingRoles())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f49579df/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 65f536b..9d2d7bb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -191,6 +191,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private final StreamStateStore streamStateStore = new StreamStateStore();
+ private final AtomicBoolean doneAuthSetup = new AtomicBoolean(false);
+
/** This method updates the local token on disk */
public void setTokens(Collection<Token> tokens)
{
@@ -657,6 +659,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
}
@@ -974,12 +977,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
+ if (!doneAuthSetup.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
private void maybeAddKeyspace(KSMetaData ksm)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b9868ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b9868ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b9868ce
Branch: refs/heads/cassandra-3.11
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <mc...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <mc...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
-2.2.10
+3.0.14
+ * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
+ * Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
+ * Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
+ * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+ * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
+ * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade (CASSANDRA-13525)
+ * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052)
+ * Add storage port options to sstableloader (CASSANDRA-13518)
+ * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847)
+ * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
+ * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
+ * Fail repair if insufficient responses received (CASSANDRA-13397)
+ * Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
+ * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
+ * Handling partially written hint files (CASSANDRA-12728)
+ * Interrupt replaying hints on decommission (CASSANDRA-13308)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
+Merged from 2.2:
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
- * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
+
+3.0.13
+ * Make reading of range tombstones more reliable (CASSANDRA-12811)
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9bc046f,9d2d7bb..3bad040
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -180,6 -162,6 +180,7 @@@ public class StorageService extends Not
private boolean initialized;
private volatile boolean joined = false;
++ private final AtomicBoolean authSetupCalled = new AtomicBoolean(false);
/* the probability for tracing any particular request, 0 disables tracing and 1 enables for all */
private double traceProbability = 0.0;
@@@ -995,15 -977,18 +997,19 @@@
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
- if (!doneAuthSetup.getAndSet(true))
++ if (!authSetupCalled.getAndSet(true))
+ {
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
++ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
- private void maybeAddKeyspace(KSMetaData ksm)
+ private void maybeAddKeyspace(KeyspaceMetadata ksm)
{
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by mc...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6220108e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6220108e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6220108e
Branch: refs/heads/cassandra-3.11
Commit: 6220108e687e28b05d7cb0bbd254751f51a0f1d7
Parents: 30412b0 7b9868c
Author: mck <mc...@apache.org>
Authored: Tue Jun 13 14:11:15 2017 +1000
Committer: mck <mc...@apache.org>
Committed: Tue Jun 13 14:15:03 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/6220108e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ffa526,26462db..f285ff0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,34 -40,12 +74,35 @@@ Merged from 3.0
* Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
- * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Prevent data loss on upgrade 2.1 - 3.0 by adding component separator to LogRecord absolute path (CASSANDRA-13294)
+ * Improve testing on macOS by eliminating sigar logging (CASSANDRA-13233)
+ * Cqlsh copy-from should error out when csv contains invalid data for collections (CASSANDRA-13071)
+ * Fix "multiple versions of ant detected..." when running ant test (CASSANDRA-13232)
+ * Coalescing strategy sleeps too much (CASSANDRA-13090)
+ * Faster StreamingHistogram (CASSANDRA-13038)
+ * Legacy deserializer can create unexpected boundary range tombstones (CASSANDRA-13237)
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+ * Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
+ * Add vm.max_map_count StartupCheck (CASSANDRA-13008)
+ * Hint related logging should include the IP address of the destination in addition to
+ host ID (CASSANDRA-13205)
+ * Reloading logback.xml does not work (CASSANDRA-13173)
+ * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
+ * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125)
+ * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152)
+ * Fix handling of partition with partition-level deletion plus
+ live rows in sstabledump (CASSANDRA-13177)
+ * Provide user workaround when system_schema.columns does not contain entries
+ for a table that's in system_schema.tables (CASSANDRA-13180)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
- * Fix NPE issue in StorageService (CASSANDRA-13060)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
Merged from 2.2:
++ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
+ * cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
+ * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6220108e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 749c6a9,3bad040..b4878c7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -190,12 -177,10 +190,13 @@@ public class StorageService extends Not
private boolean isSurveyMode = Boolean.parseBoolean(System.getProperty("cassandra.write_survey", "false"));
/* true if node is rebuilding and receiving data */
private final AtomicBoolean isRebuilding = new AtomicBoolean();
+ private final AtomicBoolean isDecommissioning = new AtomicBoolean();
- private boolean initialized;
+ private volatile boolean initialized = false;
private volatile boolean joined = false;
+ private volatile boolean gossipActive = false;
+ private final AtomicBoolean authSetupCalled = new AtomicBoolean(false);
+ private volatile boolean authSetupComplete = false;
/* the probability for tracing any particular request, 0 disables tracing and 1 enables for all */
private double traceProbability = 0.0;
@@@ -691,44 -668,9 +692,45 @@@
states.add(Pair.create(ApplicationState.STATUS, valueFactory.hibernate(true)));
Gossiper.instance.addLocalApplicationStates(states);
}
+ doAuthSetup();
logger.info("Not joining ring as requested. Use JMX (StorageService->joinRing()) to initiate ring joining");
}
+
+ initialized = true;
+ }
+
+ private void loadRingState()
+ {
+ if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true")))
+ {
+ logger.info("Loading persisted ring state");
+ Multimap<InetAddress, Token> loadedTokens = SystemKeyspace.loadTokens();
+ Map<InetAddress, UUID> loadedHostIds = SystemKeyspace.loadHostIds();
+ for (InetAddress ep : loadedTokens.keySet())
+ {
+ if (ep.equals(FBUtilities.getBroadcastAddress()))
+ {
+ // entry has been mistakenly added, delete it
+ SystemKeyspace.removeEndpoint(ep);
+ }
+ else
+ {
+ if (loadedHostIds.containsKey(ep))
+ tokenMetadata.updateHostId(loadedHostIds.get(ep), ep);
+ Gossiper.instance.addSavedEndpoint(ep);
+ }
+ }
+ }
+ }
+
+ private boolean isReplacing()
+ {
+ if (System.getProperty("cassandra.replace_address_first_boot", null) != null && SystemKeyspace.bootstrapComplete())
+ {
+ logger.info("Replace address on first boot requested; this node is already bootstrapped");
+ return false;
+ }
+ return DatabaseDescriptor.getReplaceAddress() != null;
}
/**
@@@ -1081,20 -997,18 +1083,23 @@@
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+ if (!authSetupCalled.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
- authSetupComplete = true;
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
-
+ MigrationManager.instance.register(new AuthMigrationListener());
++ authSetupComplete = true;
+ }
}
+ public boolean isAuthSetupComplete()
+ {
+ return authSetupComplete;
+ }
+
private void maybeAddKeyspace(KeyspaceMetadata ksm)
{
try
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by mc...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b9868ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b9868ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b9868ce
Branch: refs/heads/cassandra-3.0
Commit: 7b9868ce277d82f4ad84cb74e3179ff14d88b03e
Parents: 40ad3cf f49579d
Author: mck <mc...@apache.org>
Authored: Tue Jun 13 14:04:07 2017 +1000
Committer: mck <mc...@apache.org>
Committed: Tue Jun 13 14:05:12 2017 +1000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/auth/CassandraRoleManager.java | 4 ++++
.../apache/cassandra/service/StorageService.java | 16 +++++++++++-----
3 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63bb33c,56890c9..26462db
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,50 -1,10 +1,51 @@@
-2.2.10
+3.0.14
+ * Failed unregistering mbean during drop keyspace (CASSANDRA-13346)
+ * nodetool scrub/cleanup/upgradesstables exit code is wrong (CASSANDRA-13542)
+ * Fix the reported number of sstable data files accessed per read (CASSANDRA-13120)
+ * Fix schema digest mismatch during rolling upgrades from versions before 3.0.12 (CASSANDRA-13559)
+ * Upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+ * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
+ * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade (CASSANDRA-13525)
+ * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052)
+ * Add storage port options to sstableloader (CASSANDRA-13518)
+ * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847)
+ * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
+ * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
+ * Fail repair if insufficient responses received (CASSANDRA-13397)
+ * Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
+ * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
+ * Handling partially written hint files (CASSANDRA-12728)
+ * Interrupt replaying hints on decommission (CASSANDRA-13308)
+ * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
+Merged from 2.2:
+ * Nodes started with join_ring=False should be able to serve requests when authentication is enabled (CASSANDRA-11381)
* cqlsh COPY FROM: increment error count only for failures, not for attempts (CASSANDRA-13209)
- * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
+
+3.0.13
+ * Make reading of range tombstones more reliable (CASSANDRA-12811)
+ * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
+ * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
+ * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
+ * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
+ * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
+ * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
+ * Fix code to not exchange schema across major versions (CASSANDRA-13274)
+ * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
+ * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
+ * Fix NPE issue in StorageService (CASSANDRA-13060)
+Merged from 2.2:
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
- * Fix JVM metric paths (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b9868ce/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9bc046f,9d2d7bb..3bad040
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -180,6 -162,6 +180,7 @@@ public class StorageService extends Not
private boolean initialized;
private volatile boolean joined = false;
++ private final AtomicBoolean authSetupCalled = new AtomicBoolean(false);
/* the probability for tracing any particular request, 0 disables tracing and 1 enables for all */
private double traceProbability = 0.0;
@@@ -995,15 -977,18 +997,19 @@@
private void doAuthSetup()
{
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
- if (!doneAuthSetup.getAndSet(true))
++ if (!authSetupCalled.getAndSet(true))
+ {
- maybeAddOrUpdateKeyspace(AuthKeyspace.definition());
++ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
+
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- MigrationManager.instance.register(new AuthMigrationListener());
+ MigrationManager.instance.register(new AuthMigrationListener());
+ }
}
- private void maybeAddKeyspace(KSMetaData ksm)
+ private void maybeAddKeyspace(KeyspaceMetadata ksm)
{
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org