This is an automated email from the ASF dual-hosted git repository.
upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 9c1bd4b GEODE-4058: Always delete disk files after every test runs
9c1bd4b is described below
commit 9c1bd4b52a5599f1f3cb9753907181fd9097cebf
Author: Dan Smith <[email protected]>
AuthorDate: Tue Dec 5 15:56:50 2017 -0800
GEODE-4058: Always delete disk files after every test runs
Avoid hangs due to leftover disk files by making sure that all tests
that use JUnit4DistributedCase have their disk files cleaned up after
the test, including a locators ConfigDiskDir_
---
.../internal/cache/backup/BackupDistributedTest.java | 12 ++----------
...ersistentColocatedPartitionedRegionDUnitTest.java | 6 +-----
.../partitioned/fixed/FixedPartitioningTestBase.java | 4 ++--
.../internal/cache/wan/AsyncEventQueueTestBase.java | 3 +--
.../dunit/cache/internal/JUnit4CacheTestCase.java | 15 ---------------
.../dunit/internal/JUnit4DistributedTestCase.java | 20 ++++++++++++++++++++
.../apache/geode/internal/cache/wan/WANTestBase.java | 2 +-
7 files changed, 27 insertions(+), 35 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
index aa05da6..77ee719 100755
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupDistributedTest.java
@@ -300,11 +300,7 @@ public class BackupDistributedTest extends
PersistentPartitionedRegionTestBase {
// Destroy the current data
invokeInEveryVM("Clean disk dirs", () -> {
- try {
- cleanDiskDirs();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ cleanDiskDirs();
});
restoreBackup(2);
@@ -433,11 +429,7 @@ public class BackupDistributedTest extends
PersistentPartitionedRegionTestBase {
private void cleanDiskDirsInEveryVM() {
invokeInEveryVM("cleanDiskDirsInEveryVM", () -> {
- try {
- cleanDiskDirs();
- } catch (IOException e) {
- throw new UncheckedIOException(e);
- }
+ cleanDiskDirs();
});
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index d66bb84..d7c7063 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -2228,11 +2228,7 @@ public class
PersistentColocatedPartitionedRegionDUnitTest
// Runnable to clean up disk dirs on a members
SerializableRunnable cleanDiskDirs = new SerializableRunnable("Clean disk
dirs") {
public void run() {
- try {
- cleanDiskDirs();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ cleanDiskDirs();
}
};
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index 707b19a..b941922 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -1286,13 +1286,13 @@ public class FixedPartitioningTestBase extends
JUnit4DistributedTestCase {
}
try {
- cleanDiskDirs();
+ cleanDisk();
} catch (IOException e) {
LogWriterUtils.getLogWriter().error("Error cleaning disk dirs", e);
}
}
- public static void cleanDiskDirs() throws IOException {
+ public static void cleanDisk() throws IOException {
FileUtils.deleteDirectory(getDiskDir());
}
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 47dbba1..e371edc 100644
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++
b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -99,7 +99,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -1558,7 +1557,7 @@ public class AsyncEventQueueTestBase extends
JUnit4DistributedTestCase {
public static void cleanupVM() throws IOException {
closeCache();
- JUnit4CacheTestCase.cleanDiskDirs();
+ JUnit4DistributedTestCase.cleanDiskDirs();
}
public static void closeCache() throws IOException {
diff --git
a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
index fdd41c5..0750be3 100644
---
a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++
b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -15,19 +15,16 @@
package org.apache.geode.test.dunit.cache.internal;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static
org.apache.geode.distributed.ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER;
import static
org.apache.geode.distributed.internal.DistributionConfig.GEMFIRE_PREFIX;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Arrays;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.Logger;
import org.awaitility.Awaitility;
@@ -52,7 +49,6 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.VM;
@@ -492,17 +488,6 @@ public abstract class JUnit4CacheTestCase extends
JUnit4DistributedTestCase
return new File[] {getDiskDir()};
}
- public static final void cleanDiskDirs() throws IOException {
- FileUtils.deleteQuietly(getDiskDir());
- Arrays.stream(new File(".").listFiles()).forEach(file ->
deleteBACKUPDiskStoreFile(file));
- }
-
- private static void deleteBACKUPDiskStoreFile(final File file) {
- if (file.getName().startsWith("BACKUPDiskStore-")) {
- FileUtils.deleteQuietly(file);
- }
- }
-
/**
* Used to generate a cache.xml. Basically just a {@code CacheCreation} with
a few more methods
* implemented.
diff --git
a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
index 638b1e6..6665dfe 100644
---
a/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
+++
b/geode-core/src/test/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -18,6 +18,7 @@ import static
org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static
org.apache.geode.distributed.internal.ClusterConfigurationService.CLUSTER_CONFIG_DISK_DIR_PREFIX;
import static
org.apache.geode.test.dunit.DistributedTestUtils.getAllDistributedSystemProperties;
import static
org.apache.geode.test.dunit.DistributedTestUtils.unregisterInstantiatorsInThisVM;
import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
@@ -25,12 +26,16 @@ import static
org.apache.geode.test.dunit.Invoke.invokeInLocator;
import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
import static org.junit.Assert.assertNotNull;
+import java.io.File;
+import java.io.IOException;
import java.io.Serializable;
+import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
+import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.Logger;
import org.junit.After;
import org.junit.Before;
@@ -72,6 +77,7 @@ import org.apache.geode.test.dunit.DUnitBlackboard;
import org.apache.geode.test.dunit.Disconnect;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@@ -125,6 +131,19 @@ public abstract class JUnit4DistributedTestCase implements
DistributedTestFixtur
blackboard = new DUnitBlackboard();
}
+ protected static void deleteBACKUPDiskStoreFile(final File file) {
+ if (file.getName().startsWith("BACKUPDiskStore-")
+ || file.getName().startsWith(CLUSTER_CONFIG_DISK_DIR_PREFIX)) {
+ FileUtils.deleteQuietly(file);
+ }
+ }
+
+ public static final void cleanDiskDirs() {
+ FileUtils.deleteQuietly(JUnit4CacheTestCase.getDiskDir());
+ FileUtils.deleteQuietly(JUnit4CacheTestCase.getDiskDir());
+ Arrays.stream(new File(".").listFiles()).forEach(file ->
deleteBACKUPDiskStoreFile(file));
+ }
+
public final String getName() {
if (this.distributedTestFixture != this) {
return this.distributedTestFixture.getName();
@@ -578,6 +597,7 @@ public abstract class JUnit4DistributedTestCase implements
DistributedTestFixtur
IgnoredException.removeAllExpectedExceptions();
SocketCreatorFactory.close();
+ cleanDiskDirs();
}
// TODO: this should move to CacheTestCase
diff --git
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 2aca674..0e98dea 100644
---
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -3674,7 +3674,7 @@ public class WANTestBase extends
JUnit4DistributedTestCase {
Locator.getLocator().stop();
}
closeCache();
- CacheTestCase.cleanDiskDirs();
+ JUnit4DistributedTestCase.cleanDiskDirs();
}
public static void closeCache() {
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
