Author: degenaro
Date: Tue Sep 22 13:06:04 2015
New Revision: 1704615
URL: http://svn.apache.org/viewvc?rev=1704615=rev
Log:
UIMA-4532 DUCC OR+WS expunge "shares"
Fix exceptions (NPE) when using legacy ckpt, convert "deprecated" Long values
into new SizeByte values for sizes of Reservation and Slice
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java?rev=1704615=1704614=1704615=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
Tue Sep 22 13:06:04 2015
@@ -237,7 +237,7 @@ public class OrchestratorCheckpoint {
private boolean restoreStateDb()
{
- String methodName = "restoreState";
+ String methodName = "restoreStateDb";
logger.trace(methodName, null, messages.fetch("enter"));
IHistoryPersistenceManager saver =
HistoryFactory.getInstance(this.getClass().getName());
boolean retVal = false;
@@ -276,7 +276,7 @@ public class OrchestratorCheckpoint {
}
private boolean restoreStateFile() {
- String methodName = "restoreState";
+ String methodName = "restoreStateFile";
logger.trace(methodName, null, messages.fetch("enter"));
boolean retVal = false;
if(saveEnabled) {
@@ -326,11 +326,18 @@ public class OrchestratorCheckpoint {
public boolean restoreState()
{
+ String methodName = "restoreState";
+ boolean retVal = false;
// we can resolve these into just one call by allowing the
checkpointable to be saved in its parts for
// the file implementation, to avoid circular dependencies
-
-if ( useDb ) return restoreStateDb();
-else return restoreStateFile();
+ try {
+ if ( useDb ) retVal = restoreStateDb();
+else retVal = restoreStateFile();
+ }
+catch(Exception e) {
+ logger.error(methodName, null, e);
+}
+ return retVal;
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java?rev=1704615=1704614=1704615=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
Tue Sep 22 13:06:04 2015
@@ -35,21 +35,21 @@ public class JdReservation extends JdRes
private static DuccLogger logger = new DuccLogger(JdReservation.class);
private static DuccId jobid = null;
- public JdReservation(IDuccWorkReservation dwr, SizeBytes
reservationSize, SizeBytes sliceSize) {
- initialize(dwr, reservationSize, sliceSize);
+ public JdReservation(IDuccWorkReservation dwr, SizeBytes
sizeOfReservation, SizeBytes sizeOfSlice) {
+ initialize(dwr, sizeOfReservation, sizeOfSlice);
}
- private void initialize(IDuccWorkReservation dwr, SizeBytes
reservationSize, SizeBytes sliceSize) {
+ private void initialize(IDuccWorkReservation dwr, SizeBytes
sizeOfReservation, SizeBytes sizeOfSlice) {
if(dwr != null) {
DuccId jdReservationId = (DuccId) dwr.getDuccId();
setJdReservationId(jdReservationId);
setNodeIdentity(JdHelper.getNodeIdentity(dwr));
setReservationState(dwr.getReservationState());
- if(reservationSize != null) {
- setReservationSize(reservationSize);
+ if(sizeOfReservation != null) {
+
