You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ma...@apache.org on 2013/04/12 23:14:57 UTC
git commit: updated refs/heads/trunk to 24c7044
Updated Branches:
refs/heads/trunk 823ff1f8c -> 24c7044ba
GIRAPH-364: Clean up directories created by test suite
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/24c7044b
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/24c7044b
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/24c7044b
Branch: refs/heads/trunk
Commit: 24c7044baca1801896927c88ac0504fc4cd4cd08
Parents: 823ff1f
Author: Maja Kabiljo <ma...@maja-mbp.thefacebook.com>
Authored: Fri Apr 12 14:13:22 2013 -0700
Committer: Maja Kabiljo <ma...@maja-mbp.thefacebook.com>
Committed: Fri Apr 12 14:14:36 2013 -0700
----------------------------------------------------------------------
CHANGELOG | 2 +
.../org/apache/giraph/comm/TestMessageStores.java | 19 ++++++++------
.../giraph/partition/TestPartitionStores.java | 9 ++++++-
3 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/24c7044b/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 0012fa7..4f4b7b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-364: Clean up directories created by test suite (majakabiljo)
+
GIRAPH-614: SplitMasterWorker=false is broken (majakabiljo)
GIRAPH-616: Decouple vertices and edges in DiskBackedPartitionStore and avoid writing
http://git-wip-us.apache.org/repos/asf/giraph/blob/24c7044b/giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java b/giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java
index 92fd49b..53b8a24 100644
--- a/giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java
+++ b/giraph-core/src/test/java/org/apache/giraph/comm/TestMessageStores.java
@@ -21,6 +21,8 @@ package org.apache.giraph.comm;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import com.google.common.io.Files;
+import org.apache.commons.io.FileUtils;
import org.apache.giraph.bsp.CentralizedServiceWorker;
import org.apache.giraph.comm.messages.BasicMessageStore;
import org.apache.giraph.comm.messages.ByteArrayMessagesPerVertexStore;
@@ -31,6 +33,7 @@ import org.apache.giraph.comm.messages.MessageStore;
import org.apache.giraph.comm.messages.MessageStoreFactory;
import org.apache.giraph.comm.messages.SequentialFileMessageStore;
import org.apache.giraph.conf.GiraphConfiguration;
+import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.utils.ByteArrayVertexIdMessages;
import org.apache.giraph.utils.CollectionUtils;
@@ -64,7 +67,7 @@ import static org.junit.Assert.assertTrue;
/** Test for different types of message stores */
public class TestMessageStores {
- private static String directory;
+ private static File directory;
private static ImmutableClassesGiraphConfiguration config;
private static TestData testData;
private static
@@ -85,12 +88,14 @@ public class TestMessageStores {
}
@Before
- public void prepare() {
- directory = "test/";
+ public void prepare() throws IOException {
+ directory = Files.createTempDir();
Configuration.addDefaultResource("giraph-site.xml");
GiraphConfiguration initConfig = new GiraphConfiguration();
initConfig.setVertexClass(IntVertex.class);
+ GiraphConstants.MESSAGES_DIRECTORY.set(
+ initConfig, new File(directory, "giraph_messages").toString());
config = new ImmutableClassesGiraphConfiguration(initConfig);
testData = new TestData();
@@ -104,13 +109,11 @@ public class TestMessageStores {
service =
MockUtils.mockServiceGetVertexPartitionOwner(testData.numOfPartitions);
-
- new File(directory).mkdir();
}
@After
- public void cleanUp() {
- new File(directory).delete();
+ public void cleanUp() throws IOException {
+ FileUtils.deleteDirectory(directory);
}
private static class TestData {
@@ -225,7 +228,7 @@ public class TestMessageStores {
private <S extends MessageStore<IntWritable, IntWritable>> S doCheckpoint(
MessageStoreFactory<IntWritable, IntWritable, S> messageStoreFactory,
S messageStore) throws IOException {
- File file = new File(directory + "messageStoreTest");
+ File file = new File(directory, "messageStoreTest");
if (file.exists()) {
file.delete();
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/24c7044b/giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java b/giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
index 8e79a47..9bb8f71 100644
--- a/giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
+++ b/giraph-core/src/test/java/org/apache/giraph/partition/TestPartitionStores.java
@@ -18,6 +18,7 @@
package org.apache.giraph.partition;
+import org.apache.commons.io.FileUtils;
import org.apache.giraph.conf.GiraphConfiguration;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
@@ -31,7 +32,9 @@ import org.junit.Before;
import org.junit.Test;
import com.google.common.collect.Iterables;
+import com.google.common.io.Files;
+import java.io.File;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
@@ -134,7 +137,10 @@ public class TestPartitionStores {
}
@Test
- public void testDiskBackedPartitionStore() {
+ public void testDiskBackedPartitionStore() throws IOException {
+ File directory = Files.createTempDir();
+ GiraphConstants.PARTITIONS_DIRECTORY.set(
+ conf, new File(directory, "giraph_partitions").toString());
GiraphConstants.USE_OUT_OF_CORE_GRAPH.set(conf, true);
GiraphConstants.MAX_PARTITIONS_IN_MEMORY.set(conf, 1);
@@ -149,6 +155,7 @@ public class TestPartitionStores {
IntWritable, NullWritable, IntWritable>(conf, context);
testReadWrite(partitionStore, conf);
partitionStore.shutdown();
+ FileUtils.deleteDirectory(directory);
}
/**