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 80C3910B7D for ; Thu, 8 Jan 2015 04:14:54 +0000 (UTC) Received: (qmail 70721 invoked by uid 500); 8 Jan 2015 04:14:55 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70408 invoked by uid 500); 8 Jan 2015 04:14:55 -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 70110 invoked by uid 99); 8 Jan 2015 04:14:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jan 2015 04:14:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE10EA27842; Thu, 8 Jan 2015 04:14:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 08 Jan 2015 04:14:54 -0000 Message-Id: <83e645edc9cb46638fc4610b85aee035@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] cassandra git commit: Avoid creating dir in DirectoriesTest Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 1eea31460 -> ad3753309 refs/heads/cassandra-2.1 dcc90ef35 -> 5ac5ee666 refs/heads/trunk 12f17b203 -> 9606a17b3 Avoid creating dir in DirectoriesTest patch by Alan Boudreault; reviewed by yukim for CASSANDRA-6983 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad375330 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad375330 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad375330 Branch: refs/heads/cassandra-2.0 Commit: ad3753309776fb0b7096d15a7535ac76511779e3 Parents: 1eea314 Author: Alan Boudreault Authored: Wed Jan 7 18:34:01 2015 -0600 Committer: Yuki Morishita Committed: Wed Jan 7 18:36:01 2015 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/DirectoriesTest.java | 22 ++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad375330/test/unit/org/apache/cassandra/db/DirectoriesTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java index 8754fe0..c4471e5 100644 --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@ -22,6 +22,8 @@ import java.io.IOException; import java.util.*; import java.util.concurrent.*; +import org.apache.commons.lang3.StringUtils; + import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -34,6 +36,7 @@ import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.io.FSWriteError; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -190,15 +193,14 @@ public class DirectoriesTest try { DatabaseDescriptor.setDiskFailurePolicy(DiskFailurePolicy.best_effort); - - for (DataDirectory dd : Directories.dataFileLocations) + // Fake a Directory creation failure + if (Directories.dataFileLocations.length > 0) { - dd.location.setExecutable(false); - dd.location.setWritable(false); + String[] path = new String[] {KS, "bad"}; + File dir = new File(Directories.dataFileLocations[0].location, StringUtils.join(path, File.separator)); + FileUtils.handleFSError(new FSWriteError(new IOException("Unable to create directory " + dir), dir)); } - - Directories.create(KS, "bad"); - + for (DataDirectory dd : Directories.dataFileLocations) { File file = new File(dd.location, new File(KS, "bad").getPath()); @@ -207,12 +209,6 @@ public class DirectoriesTest } finally { - for (DataDirectory dd : Directories.dataFileLocations) - { - dd.location.setExecutable(true); - dd.location.setWritable(true); - } - DatabaseDescriptor.setDiskFailurePolicy(origPolicy); } }