Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D523179F6 for ; Sat, 28 Mar 2015 11:21:33 +0000 (UTC) Received: (qmail 61911 invoked by uid 500); 28 Mar 2015 11:21:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 61803 invoked by uid 500); 28 Mar 2015 11:21:33 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 61507 invoked by uid 99); 28 Mar 2015 11:21:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Mar 2015 11:21:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B041DE1868; Sat, 28 Mar 2015 11:21:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snazy@apache.org To: commits@cassandra.apache.org Date: Sat, 28 Mar 2015 11:21:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 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 Authored: Sat Mar 28 12:20:01 2015 +0100 Committer: Robert Stupp 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)