| commit | 8f5a1734e722836d13315bf94a63bec3112a248e | [log] [tgz] |
|---|---|---|
| author | Young-Seok <kisskys@gmail.com> | Wed Jul 23 16:16:29 2014 -0700 |
| committer | Ian Maxon <imaxon@uci.edu> | Wed Jul 23 16:49:43 2014 -0800 |
| tree | e15e166fcf70f1effc9b4b0ef645df8a51941e7b | |
| parent | 8618b8175196d42e30589a46809af69cbe728a32 [diff] |
Changes to fix issue793 Change-Id: I54281f8cccd2e9322c4a8f93a9aca573aea2c552 Reviewed-on: http://fulliautomatix.ics.uci.edu:8443/111 Reviewed-by: Till Westmann <westmann@gmail.com> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java b/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java index e750c07..8ccf50b 100644 --- a/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java +++ b/asterix-app/src/main/java/edu/uci/ics/asterix/hyracks/bootstrap/NCApplicationEntryPoint.java
@@ -88,8 +88,6 @@ } if (systemState == SystemState.CORRUPTED) { recoveryMgr.startRecovery(true); - } else if (systemState == SystemState.NEW_UNIVERSE) { - recoveryMgr.checkpoint(true); } } @@ -181,7 +179,7 @@ IRecoveryManager recoveryMgr = runtimeContext.getTransactionSubsystem().getRecoveryManager(); recoveryMgr.checkpoint(true); - + if (isMetadataNode) { IMetadataNode stub = null; stub = (IMetadataNode) UnicastRemoteObject.exportObject(MetadataNode.INSTANCE, 0);
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 c11766a..595b565 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
@@ -84,10 +84,9 @@ if (!rootMetadataDir.exists()) { boolean success = rootMetadataDir.mkdirs(); if (!success) { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.severe("Unable to create root metadata directory" - + rootMetadataDir.getAbsolutePath()); - } + throw new IllegalStateException( + "Unable to create root metadata directory of PersistentLocalResourceRepository in " + + rootMetadataDir.getAbsolutePath()); } if (LOGGER.isLoggable(Level.INFO)) { LOGGER.info("created the root-metadata-file's directory: " + rootMetadataDir.getAbsolutePath());