Repository: cassandra Updated Branches: refs/heads/trunk 39df31a06 -> f56c0c668
FOLLOW-UP OF Let DatabaseDescriptor not implicitly startup services patch by Robert Stupp; reviewed by Jeremiah Jordon for CASSANDRA-9054 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f56c0c66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f56c0c66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f56c0c66 Branch: refs/heads/trunk Commit: f56c0c6685a490c9237f5f8ff0baa84f3441b545 Parents: 39df31a Author: Robert Stupp <[email protected]> Authored: Sat Aug 20 21:18:27 2016 +1000 Committer: Robert Stupp <[email protected]> Committed: Sat Aug 20 21:18:27 2016 +1000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/AuthConfig.java | 4 ++-- src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +- src/java/org/apache/cassandra/service/CassandraDaemon.java | 6 ------ .../org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56c0c66/src/java/org/apache/cassandra/auth/AuthConfig.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/AuthConfig.java b/src/java/org/apache/cassandra/auth/AuthConfig.java index c3dd9a9..c389ae4 100644 --- a/src/java/org/apache/cassandra/auth/AuthConfig.java +++ b/src/java/org/apache/cassandra/auth/AuthConfig.java @@ -27,7 +27,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.FBUtilities; /** - * Only purpose is to Initialize authentication/authorization via {@link #applyAuthz()}. + * Only purpose is to Initialize authentication/authorization via {@link #applyAuth()}. * This is in this separate class as it implicitly initializes schema stuff (via classes referenced in here). */ public final class AuthConfig @@ -36,7 +36,7 @@ public final class AuthConfig private static boolean initialized; - public static void applyAuthz() + public static void applyAuth() { // some tests need this if (initialized) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56c0c66/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f9d0498..8b33242 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -128,7 +128,7 @@ public class DatabaseDescriptor setConfig(loadConfig()); applyAll(); - AuthConfig.applyAuthz(); + AuthConfig.applyAuth(); } public static void toolInitialization() http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56c0c66/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index d18fc82..4cbac41 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -46,11 +46,6 @@ import com.google.common.util.concurrent.Uninterruptibles; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.addthis.metrics3.reporter.config.ReporterConfig; -import com.codahale.metrics.Meter; -import com.codahale.metrics.MetricRegistryListener; -import com.codahale.metrics.SharedMetricRegistries; -import org.apache.cassandra.auth.AuthConfig; import org.apache.cassandra.batchlog.LegacyBatchlogMigrator; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.CFMetaData; @@ -643,7 +638,6 @@ public class CassandraDaemon public void applyConfig() { DatabaseDescriptor.daemonInitialization(); - AuthConfig.applyAuthz(); } public void startNativeTransport() http://git-wip-us.apache.org/repos/asf/cassandra/blob/f56c0c66/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index 02edf3a..56409c4 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@ -57,7 +57,6 @@ public class CQLSSTableWriterTest static { DatabaseDescriptor.daemonInitialization(); - AuthConfig.applyAuthz(); } @BeforeClass
