properly delete transaction log directories during all tests (MD, Exec, Opt)
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
index fb87a8e1..4046943 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -18,8 +18,7 @@
public class AsterixHyracksIntegrationUtil {
- public static final String NC1_ID = "nc1";
- public static final String NC2_ID = "nc2";
+ public static final String[] NC_IDS = { "nc1", "nc2" };
public static final String[] ASTERIX_DATA_DIRS = new String[] { "nc1data", "nc2data" };
public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
@@ -50,7 +49,7 @@
ncConfig1.dataIPAddress = "127.0.0.1";
ncConfig1.datasetIPAddress = "127.0.0.1";
ncConfig1.resultHistorySize = 1000;
- ncConfig1.nodeId = NC1_ID;
+ ncConfig1.nodeId = NC_IDS[0];
ncConfig1.ioDevices = System.getProperty("java.io.tmpdir") + File.separator + "nc1/iodevice0" + ","
+ System.getProperty("java.io.tmpdir") + File.separator + "nc1/iodevice1";
ncConfig1.appNCMainClass = NCApplicationEntryPoint.class.getName();
@@ -64,7 +63,7 @@
ncConfig2.dataIPAddress = "127.0.0.1";
ncConfig2.datasetIPAddress = "127.0.0.1";
ncConfig2.resultHistorySize = 1000;
- ncConfig2.nodeId = NC2_ID;
+ ncConfig2.nodeId = NC_IDS[1];
ncConfig2.ioDevices = System.getProperty("java.io.tmpdir") + File.separator + "nc2/iodevice0" + ","
+ System.getProperty("java.io.tmpdir") + File.separator + "nc2/iodevice1";
ncConfig2.appNCMainClass = NCApplicationEntryPoint.class.getName();
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
index dfbd305..dd15d31 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/metadata/MetadataTest.java
@@ -27,6 +27,8 @@
import org.junit.runners.Parameterized.Parameters;
import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
+import edu.uci.ics.asterix.common.config.AsterixPropertiesAccessor;
+import edu.uci.ics.asterix.common.config.AsterixTransactionProperties;
import edu.uci.ics.asterix.common.config.GlobalConfig;
import edu.uci.ics.asterix.test.aql.TestsUtils;
import edu.uci.ics.asterix.testframework.context.TestCaseContext;
@@ -44,6 +46,8 @@
private static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml";
private static final String WEB_SERVER_PORT = "19002";
+ private static AsterixTransactionProperties txnProperties;
+
@BeforeClass
public static void setUp() throws Exception {
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, TEST_CONFIG_FILE_NAME);
@@ -51,13 +55,12 @@
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
- }
+ AsterixPropertiesAccessor apa = new AsterixPropertiesAccessor();
+ txnProperties = new AsterixTransactionProperties(apa);
+
+ deleteTransactionLogs();
AsterixHyracksIntegrationUtil.init();
-
}
@AfterClass
@@ -74,9 +77,15 @@
TestsUtils.deleteRec(new File(d));
}
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
+ deleteTransactionLogs();
+ }
+
+ private static void deleteTransactionLogs() throws Exception {
+ for (String ncId : AsterixHyracksIntegrationUtil.NC_IDS) {
+ File log = new File(txnProperties.getLogDirectory(ncId));
+ if (log.exists()) {
+ FileUtils.deleteDirectory(log);
+ }
}
}
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
index 0f1f8b5..b7ef7a8 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/optimizer/OptimizerTest.java
@@ -22,6 +22,8 @@
import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
import edu.uci.ics.asterix.api.java.AsterixJavaClient;
+import edu.uci.ics.asterix.common.config.AsterixPropertiesAccessor;
+import edu.uci.ics.asterix.common.config.AsterixTransactionProperties;
import edu.uci.ics.asterix.common.config.GlobalConfig;
import edu.uci.ics.asterix.common.exceptions.AsterixException;
import edu.uci.ics.asterix.external.dataset.adapter.FileSystemBasedAdapter;
@@ -49,6 +51,8 @@
private static final ArrayList<String> only = AsterixTestHelper.readFile(FILENAME_ONLY, PATH_BASE);
private static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml";
+ private static AsterixTransactionProperties txnProperties;
+
@BeforeClass
public static void setUp() throws Exception {
// File outdir = new File(PATH_ACTUAL);
@@ -59,10 +63,10 @@
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
- }
+ AsterixPropertiesAccessor apa = new AsterixPropertiesAccessor();
+ txnProperties = new AsterixTransactionProperties(apa);
+
+ deleteTransactionLogs();
AsterixHyracksIntegrationUtil.init();
// Set the node resolver to be the identity resolver that expects node names
@@ -71,6 +75,15 @@
IdentitiyResolverFactory.class.getName());
}
+ private static void deleteTransactionLogs() throws Exception {
+ for (String ncId : AsterixHyracksIntegrationUtil.NC_IDS) {
+ File log = new File(txnProperties.getLogDirectory(ncId));
+ if (log.exists()) {
+ FileUtils.deleteDirectory(log);
+ }
+ }
+ }
+
@AfterClass
public static void tearDown() throws Exception {
// _bootstrap.stop();
@@ -80,10 +93,7 @@
outdir.delete();
}
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
- }
+ deleteTransactionLogs();
}
private static void suiteBuild(File dir, Collection<Object[]> testArgs, String path) {
diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
index 2289484..559080c 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
@@ -13,6 +13,8 @@
import org.junit.runners.Parameterized.Parameters;
import edu.uci.ics.asterix.api.common.AsterixHyracksIntegrationUtil;
+import edu.uci.ics.asterix.common.config.AsterixPropertiesAccessor;
+import edu.uci.ics.asterix.common.config.AsterixTransactionProperties;
import edu.uci.ics.asterix.common.config.GlobalConfig;
import edu.uci.ics.asterix.external.dataset.adapter.FileSystemBasedAdapter;
import edu.uci.ics.asterix.external.util.IdentitiyResolverFactory;
@@ -30,6 +32,8 @@
private static final String TEST_CONFIG_FILE_NAME = "asterix-build-configuration.xml";
private static final String[] ASTERIX_DATA_DIRS = new String[] { "nc1data", "nc2data" };
+ private static AsterixTransactionProperties txnProperties;
+
@BeforeClass
public static void setUp() throws Exception {
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, TEST_CONFIG_FILE_NAME);
@@ -37,10 +41,10 @@
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
- }
+ AsterixPropertiesAccessor apa = new AsterixPropertiesAccessor();
+ txnProperties = new AsterixTransactionProperties(apa);
+
+ deleteTransactionLogs();
AsterixHyracksIntegrationUtil.init();
@@ -67,13 +71,19 @@
TestsUtils.deleteRec(new File(d));
}
- File log = new File("asterix_logs");
- if (log.exists()) {
- FileUtils.deleteDirectory(log);
- }
+ deleteTransactionLogs();
HDFSCluster.getInstance().cleanup();
}
+ private static void deleteTransactionLogs() throws Exception {
+ for (String ncId : AsterixHyracksIntegrationUtil.NC_IDS) {
+ File log = new File(txnProperties.getLogDirectory(ncId));
+ if (log.exists()) {
+ FileUtils.deleteDirectory(log);
+ }
+ }
+ }
+
@Parameters
public static Collection<Object[]> tests() throws Exception {
Collection<Object[]> testArgs = new ArrayList<Object[]>();