cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Sat, 28 Mar 2015 11:21:36 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b1331fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b1331fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b1331fe

Branch: refs/heads/cassandra-2.1
Commit: 7b1331fed57203170e5d7a573dfa6113bfe6a3c0
Parents: 8715fff 102f59c
Author: Robert Stupp <snazy@snazy.de>
Authored: Sat Mar 28 12:20:01 2015 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Sat Mar 28 12:20:01 2015 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/Directories.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b1331fe/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Directories.java
index 6af3082,a4ea1f2..7bb7e2e
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -285,10 -251,13 +285,13 @@@ public class Directorie
  
          // pick directories with enough space and so that resulting sstable dirs aren't
blacklisted for writes.
          boolean tooBig = false;
 -        for (DataDirectory dataDir : dataFileLocations)
 +        for (DataDirectory dataDir : dataDirectories)
          {
              if (BlacklistedDirectories.isUnwritable(getLocationForDisk(dataDir)))
+             {
+                 logger.debug("removing blacklisted candidate {}", dataDir.location);
                  continue;
+             }
              DataDirectoryCandidate candidate = new DataDirectoryCandidate(dataDir);
              // exclude directory if its total writeSize does not fit to data directory
              if (candidate.availableSpace < writeSize)


Mime
View raw message