You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2019/06/24 15:36:24 UTC
svn commit: r1862012 -
/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
Author: degenaro
Date: Mon Jun 24 15:36:24 2019
New Revision: 1862012
URL: http://svn.apache.org/viewvc?rev=1862012&view=rev
Log:
UIMA-6080 DUCC Job Driver (JD) NPE doing status exchange with Orchestrator (OR)
Modified:
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java?rev=1862012&r1=1862011&r2=1862012&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java Mon Jun 24 15:36:24 2019
@@ -180,24 +180,17 @@ public class JobDriverStateExchanger ext
private void abortIfTold(JdReplyEvent jdReplyEvent) {
String location = "abortIfTold";
- if(jdReplyEvent != null) {
- if(jdReplyEvent.isDuccHeadMaster()) {
- String killDriverReason = jdReplyEvent.getKillDriverReason();
- if(killDriverReason != null) {
- int code = 255;
- StringBuffer sb = new StringBuffer();
- sb.append("System Exit");
- sb.append(" ");
- sb.append("code="+code);
- sb.append(" ");
- sb.append("reason="+killDriverReason);
- logger.warn(location, jobid, sb.toString());
- System.exit(code);
- }
- }
- else {
- logger.warn(location, jobid, "not master");
- }
+ String killDriverReason = jdReplyEvent.getKillDriverReason();
+ if(killDriverReason != null) {
+ int code = 255;
+ StringBuffer sb = new StringBuffer();
+ sb.append("System Exit");
+ sb.append(" ");
+ sb.append("code="+code);
+ sb.append(" ");
+ sb.append("reason="+killDriverReason);
+ logger.warn(location, jobid, sb.toString());
+ System.exit(code);
}
}
@@ -316,7 +309,22 @@ public class JobDriverStateExchanger ext
try {
JdRequestEvent jdRequestEvent = getJdRequestEvent();
JdReplyEvent jdReplyEvent = request(jdRequestEvent);
- handle(jdReplyEvent);
+ if(jdReplyEvent != null) {
+ if(jdReplyEvent.isDuccHeadMaster()) {
+ if(jdReplyEvent.getProcessMap() != null) {
+ handle(jdReplyEvent);
+ }
+ else {
+ logger.warn(location, jobid, "no map");
+ }
+ }
+ else {
+ logger.warn(location, jobid, "not master");
+ }
+ }
+ else {
+ logger.warn(location, jobid, "null reply");
+ }
if(!communications_ok) {
logger.warn(location, jobid, "Status reporting resumed.");
communications_ok = true;