Don't use static dataDirectories field in Directories instances patch by Blake Eggleston; reviewed by Aleksey Yeschenko for CASSANDRA-11647
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f294750f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f294750f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f294750f Branch: refs/heads/trunk Commit: f294750f535f2a73c71eba589dcaf19074f91bbf Parents: b1cf0fe Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Mon Apr 25 13:06:30 2016 -0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu May 19 16:09:00 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Directories.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f96c31a..4c50980 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.7 + * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647) Merged from 3.0: * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) * Allow compaction strategies to disable early open (CASSANDRA-11754) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f294750f/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java index 3898180..7876959 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -296,7 +296,7 @@ public class Directories { if (directory != null) { - for (DataDirectory dataDirectory : dataDirectories) + for (DataDirectory dataDirectory : paths) { if (directory.getAbsolutePath().startsWith(dataDirectory.location.getAbsolutePath())) return dataDirectory; @@ -464,7 +464,7 @@ public class Directories public DataDirectory[] getWriteableLocations() { List<DataDirectory> nonBlacklistedDirs = new ArrayList<>(); - for (DataDirectory dir : dataDirectories) + for (DataDirectory dir : paths) { if (!BlacklistedDirectories.isUnwritable(dir.location)) nonBlacklistedDirs.add(dir);
