addressed code review comments
diff --git a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
index 1fd0739..70f7142 100644
--- a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
+++ b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/driver/InstallerUtil.java
@@ -247,7 +247,7 @@
String txnLogDir = null;
for (Node node : cluster.getNode()) {
coredumpDir = node.getLogDir() == null ? cluster.getLogDir() : node.getLogDir();
- coredump.add(new Coredump(asterixInstanceName + "_" + node.getId(), coredumpDir));
+ coredump.add(new Coredump(asterixInstanceName + "_" + node.getId(), coredumpDir + File.separator + asterixInstanceName + "_" + node.getId()));
txnLogDir = node.getTxnLogDir() == null ? cluster.getTxnLogDir() : node.getTxnLogDir();
txnLogDirs.add(new TransactionLogDir(asterixInstanceName + "_" + node.getId(), txnLogDir));
diff --git a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/model/AsterixInstance.java b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/model/AsterixInstance.java
index 1c01fe5..751cc36 100644
--- a/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/model/AsterixInstance.java
+++ b/asterix-installer/src/main/java/edu/uci/ics/asterix/installer/model/AsterixInstance.java
@@ -27,8 +27,10 @@
public class AsterixInstance implements Serializable {
- private static final long serialVersionUID = 2874439550187520449L;
+ private static final long serialVersionUID = 1L;
+ private static final int WEB_INTERFACE_PORT_DEFAULT = 19001;
+
public enum State {
ACTIVE,
INACTIVE,
@@ -137,14 +139,13 @@
}
public String getWebInterfaceUrl() {
- int webPort = 19001;
+ int webPort = WEB_INTERFACE_PORT_DEFAULT;
for (Property p : asterixConfiguration.getProperty()) {
if (p.getName().equalsIgnoreCase("web.port")) {
webPort = Integer.parseInt(p.getValue());
}
}
- String webInterfaceUrl = "http://" + cluster.getMasterNode().getClientIp() + ":" + webPort;
- return webInterfaceUrl;
+ return "http://" + cluster.getMasterNode().getClientIp() + ":" + webPort;
}
public AsterixRuntimeState getAsterixRuntimeState() {
diff --git a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/PersistentLocalResourceRepository.java b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
index d99fa8b..fd25f5a 100644
--- a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
+++ b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
@@ -64,8 +64,8 @@
}
private String prepareRootMetaDataFileName(String mountPoint, String nodeId, int ioDeviceId) {
- return mountPoint + File.separator + ROOT_METADATA_DIRECTORY + File.separator + ROOT_METADATA_DIRECTORY + "_"
- + nodeId + "_" + "iodevice" + ioDeviceId;
+ return mountPoint + File.separator + ROOT_METADATA_DIRECTORY + File.separator +
+ nodeId + "_" + "iodevice" + ioDeviceId;
}
public void initialize(String nodeId, String rootDir, boolean isNewUniverse, ResourceIdFactory resourceIdFactory)