Author: degenaro
Date: Tue Sep 22 13:06:04 2015
New Revision: 1704615
URL: http://svn.apache.org/viewvc?rev=1704615&view=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&r1=1704614&r2=1704615&view=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&r1=1704614&r2=1704615&view=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) {
+ setSizeOfReservation(sizeOfReservation);
}
- if(sliceSize != null) {
- setSliceSize(sliceSize);
+ if(sizeOfSlice != null) {
+ setSizeOfSlice(sizeOfSlice);
}
}
}
@@ -80,9 +80,9 @@ public class JdReservation extends JdRes
public Long getSlicesTotal() {
String location = "getSlicesTotal";
- SizeBytes reservationSize = getReservationSize();
- SizeBytes sliceSize = getSliceSize();
- Long retVal = (long) (reservationSize.getBytes() / (1.0 *
sliceSize.getBytes()));
+ SizeBytes sizeOfReservation = getSizeOfReservation();
+ SizeBytes sizeOfSlice = getSizeOfSlice();
+ Long retVal = (long) (sizeOfReservation.getBytes() / (1.0 *
sizeOfSlice.getBytes()));
logger.trace(location, jobid, retVal);
return retVal;
}
@@ -113,7 +113,7 @@ public class JdReservation extends JdRes
}
protected NodeIdentity allocate(DuccId jdId, DuccId jobId) {
- NodeIdentity retVal = allocate(jdId, jobId, getSliceSize());
+ NodeIdentity retVal = allocate(jdId, jobId, getSizeOfSlice());
return retVal;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java?rev=1704615&r1=1704614&r2=1704615&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
Tue Sep 22 13:06:04 2015
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.SizeBytes;
+import org.apache.uima.ducc.common.SizeBytes.Type;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
@@ -33,8 +34,13 @@ public class JdReservationBean implement
private DuccId jdReservationDuccId = null;
private NodeIdentity nodeIdentity;
private ReservationState reservationState = null;
- private SizeBytes reservationSize = new
SizeBytes(SizeBytes.Type.GBytes,30);
- private SizeBytes sliceSize = new SizeBytes(SizeBytes.Type.MBytes,300);
+ private SizeBytes sizeOfReservation = new
SizeBytes(SizeBytes.Type.GBytes,30);
+ private SizeBytes sizeOfSlice = new
SizeBytes(SizeBytes.Type.MBytes,300);
+
+ @Deprecated
+ private Long reservationSize = new Long(0);
+ @Deprecated
+ private Long sliceSize = new Long(0);
private ConcurrentHashMap<DuccId, SizeBytes> map = new
ConcurrentHashMap<DuccId, SizeBytes>();
@@ -70,20 +76,29 @@ public class JdReservationBean implement
return reservationState;
}
- public void setReservationSize(SizeBytes value) {
- reservationSize = value;
- }
-
- public SizeBytes getReservationSize() {
- return reservationSize;
- }
-
- public void setSliceSize(SizeBytes value) {
- sliceSize = value;
- }
-
- public SizeBytes getSliceSize() {
- return sliceSize;
+ public void setSizeOfReservation(SizeBytes value) {
+ reservationSize = new Long(0);
+ sizeOfReservation = value;
+ }
+
+ public SizeBytes getSizeOfReservation() {
+ if(reservationSize > 0) {
+ sizeOfReservation = new SizeBytes(Type.Bytes,
reservationSize);
+ reservationSize = new Long(0);
+ }
+ return sizeOfReservation;
+ }
+
+ public void setSizeOfSlice(SizeBytes value) {
+ sliceSize = new Long(0);
+ sizeOfSlice = value;
+ }
+
+ public SizeBytes getSizeOfSlice() {
+ if(sliceSize > 0) {
+ sizeOfSlice = new SizeBytes(Type.Bytes, sliceSize);
+ sliceSize = new Long(0);
+ }
+ return sizeOfSlice;
}
-
}
