Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/Keyspace.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30d3623b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30d3623b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30d3623b Branch: refs/heads/trunk Commit: 30d3623bcbb2d02d2ed24351045b5d657c08d236 Parents: 55c48c2 be79ba5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jun 13 07:50:41 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jun 13 07:50:41 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Keyspace.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30d3623b/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/Keyspace.java index cfae05c,308d8ef..2fe9197 --- a/src/java/org/apache/cassandra/db/Keyspace.java +++ b/src/java/org/apache/cassandra/db/Keyspace.java @@@ -63,8 -56,16 +63,10 @@@ public class Keyspac private static final Logger logger = LoggerFactory.getLogger(Keyspace.class); - /** - * accesses to CFS.memtable should acquire this for thread safety. - * CFS.maybeSwitchMemtable should aquire the writeLock; see that method for the full explanation. - * <p/> - * (Enabling fairness in the RRWL is observed to decrease throughput, so we leave it off.) - */ - public static final ReentrantReadWriteLock switchLock = new ReentrantReadWriteLock(); + public final KeyspaceMetrics metric; + public final KeyspaceMetrics metric; + // It is possible to call Keyspace.open without a running daemon, so it makes sense to ensure // proper directories here as well as in CassandraDaemon. static