You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2014/05/05 18:56:09 UTC

svn commit: r1592570 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/

Author: burn
Date: Mon May  5 16:56:09 2014
New Revision: 1592570

URL: http://svn.apache.org/r1592570
Log:
UIMA-3796 - Undo previous OR change - monitor now issues the cancel as the user

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1592570&r1=1592569&r2=1592570&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Mon May  5 16:56:09 2014
@@ -548,15 +548,6 @@ implements Orchestrator {
 						logger.info(methodName, duccId, reqUser+" is "+SpecificationProperties.key_role_administrator);
 						retVal = true;
 					}
-					else {
-					    // JIRA 3796 - assume this and other daemons are administrators 
-					    if (reqUser.equals(System.getProperty("user.name"))) {
-					        logger.info(methodName, duccId, reqUser+" is "+SpecificationProperties.key_role_administrator + " (implicitly}");
-					        retVal = true;
-					    } else {
-					        logger.info(methodName, duccId, reqUser+" is not "+SpecificationProperties.key_role_administrator);
-					    }
-					}
 				}
 				else {
 					logger.info(methodName, duccId, "role"+" is not "+SpecificationProperties.key_role_administrator);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java?rev=1592570&r1=1592569&r2=1592570&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java Mon May  5 16:56:09 2014
@@ -299,12 +299,10 @@ public class DuccWebMonitorJob {
 		return retVal;
 	}
 
-	protected void cancel(DuccId duccId) {
+	protected void cancel(DuccId duccId, String userId) {
 		String location = "cancel";
 		duccLogger.trace(location, jobid, "enter");
 		
-		String userId = System.getProperty("user.name");
-		
 		duccLogger.info(location, duccId, userId);
 		
 		String java = "/bin/java";
@@ -314,10 +312,9 @@ public class DuccWebMonitorJob {
 		String arg1 = "--"+JobRequestProperties.key_id;
 		String arg2 = ""+duccId;
 		String arg3 = "--"+SpecificationProperties.key_reason;
-		String arg4 = "\"submitter terminated, therefore canceled automatically\"";
-		String arg5 = "--"+SpecificationProperties.key_role_administrator;
+		String arg4 = "\"Canceled by monitor (submitter terminated)\"";
 		
-		String[] arglistUser = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4, arg5 };
+		String[] arglistUser = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4 };
 		String result = DuccAsUser.duckling(userId, arglistUser);
 		duccLogger.warn(location, duccId, result);
 		
@@ -338,7 +335,7 @@ public class DuccWebMonitorJob {
 			long expiryMillis = ti.time;
 			if(nowMillis > expiryMillis) {
 				if(isCancelable(duccId)) {
-					cancel(duccId);
+					cancel(duccId, ti.user);
 				}
 				else {
 					duccLogger.debug(location, duccId, "not cancelable");

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java?rev=1592570&r1=1592569&r2=1592570&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java Mon May  5 16:56:09 2014
@@ -35,6 +35,7 @@ import org.apache.uima.ducc.transport.ev
 import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
 import org.apache.uima.ducc.transport.event.common.DuccWorkMap;
 import org.apache.uima.ducc.transport.event.common.IDuccProcess;
+import org.apache.uima.ducc.transport.event.common.IRationale;
 import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
 import org.apache.uima.ducc.transport.event.common.IDuccWork;
 import org.apache.uima.ducc.ws.authentication.DuccAsUser;
@@ -114,6 +115,14 @@ public class DuccWebMonitorManagedReserv
 				duccLogger.info(location, duccId, "state: "+state);
 				stateSequence.add(state);
 			}
+			
+            IRationale rationale = dwr.getCompletionRationale();
+            if (rationale != null && rationale.isSpecified()) {
+                String text = rationale.getText();
+                if (text != null) {
+                    monitorInfo.rationale = text;
+                }
+            }
 		}
 		
 		iterator = gone.iterator();
@@ -296,12 +305,10 @@ public class DuccWebMonitorManagedReserv
 		return retVal;
 	}
 
-	protected void cancel(DuccId duccId) {
+	protected void cancel(DuccId duccId, String userId) {
 		String location = "cancel";
 		duccLogger.trace(location, jobid, "enter");
 		
-		String userId = System.getProperty("user.name");
-		
 		duccLogger.info(location, duccId, userId);
 		
 		String java = "/bin/java";
@@ -311,10 +318,9 @@ public class DuccWebMonitorManagedReserv
 		String arg1 = "--"+JobRequestProperties.key_id;
 		String arg2 = ""+duccId;
 		String arg3 = "--"+SpecificationProperties.key_reason;
-		String arg4 = "\"submitter terminated, therefore canceled automatically\"";
-		String arg5 = "--"+SpecificationProperties.key_role_administrator;
+		String arg4 = "\"Canceled by monitor (submitter terminated)\"";
 		
-		String[] arglistUser = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4, arg5 };
+		String[] arglistUser = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4 };
 		String result = DuccAsUser.duckling(userId, arglistUser);
 		duccLogger.warn(location, duccId, result);
 		
@@ -335,7 +341,7 @@ public class DuccWebMonitorManagedReserv
 			long expiryMillis = ti.time;
 			if(nowMillis > expiryMillis) {
 				if(isCancelable(duccId)) {
-					cancel(duccId);
+					cancel(duccId, ti.user);
 				}
 				else {
 					duccLogger.debug(location, duccId, "not cancelable");