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 2013/10/03 14:26:14 UTC
svn commit: r1528825 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
StateManager.java user/UserLogging.java
Author: degenaro
Date: Thu Oct 3 12:26:13 2013
New Revision: 1528825
URL: http://svn.apache.org/r1528825
Log:
UIMA-3038 DUCC orchestrator (OR) record to ducc.log RM reason for refusal (for Jobs and Services)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/UserLogging.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1528825&r1=1528824&r2=1528825&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Thu Oct 3 12:26:13 2013
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.orchestrator;
+import java.io.File;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -35,6 +36,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.orchestrator.user.UserLogging;
import org.apache.uima.ducc.transport.agent.IUimaPipelineAEComponent;
import org.apache.uima.ducc.transport.event.common.DuccProcess;
import org.apache.uima.ducc.transport.event.common.DuccReservation;
@@ -706,6 +708,10 @@ public class StateManager {
duccWorkJob.setCompletionRationale(new Rationale("resource manager refused allocation: "+rmResourceState.getReason()));
changes += stateChange(duccWorkJob,JobState.Completed);
logger.warn(methodName, duccId, messages.fetchLabel("refused")+rmResourceState.getReason());
+ String userName = duccWorkJob.getStandardInfo().getUser();
+ String userLogDir = duccWorkJob.getUserLogsDir()+duccWorkJob.getDuccId().getFriendly()+File.separator;;
+ String text = rmResourceState.getReason();
+ UserLogging.record(userName, userLogDir, text);
}
if(duccWorkJob.getProcessMap().size() > 0) {
changes += stateChange(duccWorkJob,JobState.Initializing);
@@ -808,6 +814,10 @@ public class StateManager {
duccWorkService.setCompletionRationale(new Rationale("resource manager refused allocation: "+rmResourceState.getReason()));
changes += stateChange(duccWorkService,JobState.Completed);
logger.warn(methodName, duccId, messages.fetchLabel("refused")+rmResourceState.getReason());
+ String userName = duccWorkService.getStandardInfo().getUser();
+ String userLogDir = duccWorkService.getUserLogsDir()+duccWorkService.getDuccId().getFriendly()+File.separator;;
+ String text = rmResourceState.getReason();
+ UserLogging.record(userName, userLogDir, text);
}
if(duccWorkService.getProcessMap().size() > 0) {
changes += stateChange(duccWorkService,JobState.Initializing);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/UserLogging.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/UserLogging.java?rev=1528825&r1=1528824&r2=1528825&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/UserLogging.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/UserLogging.java Thu Oct 3 12:26:13 2013
@@ -30,6 +30,12 @@ public class UserLogging {
private String userLogDir = null;
private String userDuccLog = null;
+
+ public static void record(String userName, String userLogDir, String text) {
+ UserLogging userLogging = new UserLogging(userName, userLogDir);
+ userLogging.toUserDuccLog(text);
+ }
+
public UserLogging(String userName, String userLogDir) {
setUserName(userName);
setUserLogDir(userLogDir);