You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/03/15 19:02:26 UTC

svn commit: r923366 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Author: jbellis
Date: Mon Mar 15 18:02:26 2010
New Revision: 923366

URL: http://svn.apache.org/viewvc?rev=923366&view=rev
Log:
disallow CommitLogDirectory matching a DataFileDirectory.  patch by Brandon Williams; reviewed by jbellis for CASSANDRA-888

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=923366&r1=923365&r2=923366&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Mar 15 18:02:26 2010
@@ -26,6 +26,8 @@
  * Remove obsolete ControlPort code from DatabaseDescriptor (CASSANDRA-886)
  * move skipBytes side effect out of assert (CASSANDRA-899)
  * add "double getLoad" to StorageServiceMBean (CASSANDRA-898)
+ * track row stats per CF at compaction time (CASSANDRA-870)
+ * disallow CommitLogDirectory matching a DataFileDirectory (CASSANDRA-888)
 
 
 0.6.0-beta1/beta2

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=923366&r1=923365&r2=923366&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Mon Mar 15 18:02:26 2010
@@ -443,6 +443,12 @@ public class DatabaseDescriptor
             dataFileDirectories = xmlUtils.getNodeValues("/Storage/DataFileDirectories/DataFileDirectory");
             logFileDirectory = xmlUtils.getNodeValue("/Storage/CommitLogDirectory");
 
+            for (String datadir : dataFileDirectories)
+            {
+                if (datadir.equals(logFileDirectory))
+                    throw new ConfigurationException("CommitLogDirectory must not be the same as any DataFileDirectory");
+            }
+
             /* threshold after which commit log should be rotated. */
             String value = xmlUtils.getNodeValue("/Storage/CommitLogRotationThresholdInMB");
             if ( value != null)