You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/02/01 23:11:51 UTC
[3/6] cassandra git commit: Fix isClientMode check in Keyspace
Fix isClientMode check in Keyspace
patch by Jeremiah Jordan; reviewed by yukim for CASSANDRA-8687
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2dd6944f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dd6944f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dd6944f
Branch: refs/heads/trunk
Commit: 2dd6944f1cf9236e2ca63f6a1fa67b020c175f8f
Parents: d0005a8
Author: Jeremiah Jordan <je...@datastax.com>
Authored: Sun Feb 1 16:07:59 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Sun Feb 1 16:07:59 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/Keyspace.java | 7 ++-----
2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4754867..9e9b772 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
(CASSANDRA-8619)
* Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645)
* Add batch remove iterator to ABSC (CASSANDRA-8414, 8666)
+ * Fix isClientMode check in Keyspace (CASSANDRA-8687)
2.0.12:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dd6944f/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 28045f4..38b7c2b 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -30,10 +30,7 @@ import com.google.common.collect.Iterables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
-import org.apache.cassandra.config.Schema;
+import org.apache.cassandra.config.*;
import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.index.SecondaryIndex;
@@ -69,7 +66,7 @@ public class Keyspace
// proper directories here as well as in CassandraDaemon.
static
{
- if (!StorageService.instance.isClientMode())
+ if (!(Config.isClientMode() || StorageService.instance.isClientMode()))
DatabaseDescriptor.createAllDirectories();
}