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 2017/01/16 11:32:20 UTC

svn commit: r1779014 - /uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java

Author: degenaro
Date: Mon Jan 16 11:32:20 2017
New Revision: 1779014

URL: http://svn.apache.org/viewvc?rev=1779014&view=rev
Log:
UIMA-5254 DUCC Orchestrator (OR) improved trace capability of reported Node Inventory

Modified:
    uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java

Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1779014&r1=1779013&r2=1779014&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java Mon Jan 16 11:32:20 2017
@@ -200,6 +200,9 @@ public class ProcessAccounting {
 		String methodName = "copyInventoryMajorFaults";
 		logger.trace(methodName, null, messages.fetch("enter"));
 		process.setMajorFaults(inventoryProcess.getMajorFaults());
+		DuccId jobid = dw.getDuccId();
+		DuccId processId = process.getDuccId();
+		logger.trace(methodName, jobid, processId, "MajofFaults:"+process.getMajorFaults());
 		logger.trace(methodName, null, messages.fetch("exit"));
 		return;
 	}
@@ -208,6 +211,9 @@ public class ProcessAccounting {
 		String methodName = "copyInventoryRss";
 		logger.trace(methodName, null, messages.fetch("enter"));
 		process.setResidentMemory(inventoryProcess.getResidentMemory());
+		DuccId jobid = dw.getDuccId();
+		DuccId processId = process.getDuccId();
+		logger.trace(methodName, jobid, processId, "Rss:"+process.getResidentMemory());
 		logger.trace(methodName, null, messages.fetch("exit"));
 		return;
 	}
@@ -460,7 +466,6 @@ public class ProcessAccounting {
 	private void copyInventoryProcessState(IDuccWorkJob job, IDuccProcess inventoryProcess, IDuccProcess process) {
 		String methodName = "copyInventoryProcessState";
 		logger.trace(methodName, job.getDuccId(), messages.fetch("enter"));
-		
 		if(!compare(inventoryProcess.getProcessState().toString(),process.getProcessState().toString())) {
 			switch((JobState)job.getStateObject()) {
 			//case Initializing:
@@ -468,7 +473,6 @@ public class ProcessAccounting {
 			//	break;
 			default:
 				process.advanceProcessState(inventoryProcess.getProcessState());
-				logger.trace(methodName, job.getDuccId(), process.getDuccId(), messages.fetchLabel("process state")+process.getProcessState());
 				if ( inventoryProcess.getProcessJmxUrl() != null && process.getProcessJmxUrl() == null) {
 					process.setProcessJmxUrl(inventoryProcess.getProcessJmxUrl());
 				}
@@ -476,6 +480,7 @@ public class ProcessAccounting {
 				break;
 			}
 		}
+		logger.trace(methodName, job.getDuccId(), process.getDuccId(), messages.fetchLabel("process state")+process.getProcessState());
 		logger.trace(methodName, job.getDuccId(), messages.fetch("exit"));
 	}