Author: cwiklik
Date: Mon Dec 11 14:34:15 2017
New Revision: 1817781
URL: http://svn.apache.org/viewvc?rev=1817781&view=rev
Log:
UIMA-5677 removed casting to int in normalizeMemory().
Modified:
uima/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
Modified:
uima/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java?rev=1817781&r1=1817780&r2=1817781&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
Mon Dec 11 14:34:15 2017
@@ -24,8 +24,6 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.camel.CamelContext;
-import org.apache.camel.dataformat.xstream.XStreamDataFormat;
-import org.apache.camel.impl.DefaultClassResolver;
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties;
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties.DaemonName;
@@ -34,7 +32,6 @@ import org.apache.uima.ducc.common.main.
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents.Daemon;
import org.apache.uima.ducc.common.utils.id.DuccId;
-import org.apache.uima.ducc.pm.helper.DuccWorkHelper;
import org.apache.uima.ducc.transport.cmdline.ICommandLine;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
import org.apache.uima.ducc.transport.event.DaemonDuccEvent;
@@ -54,13 +51,8 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
-import org.apache.uima.ducc.transport.event.common.IDuccWorkExecutable;
-import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.ProcessMemoryAssignment;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.security.AnyTypePermission;
-
/**
* The ProcessManager's main role is to receive Orchestrator updates, trim
received state and
* publish a new state to the agents. Trimming is done to remove state that is
irrelevant to
@@ -77,8 +69,6 @@ implements ProcessManager {
private static String tbl=String.format("%1$-158s"," ").replace(" ",
"-");
public static DuccLogger logger = new
DuccLogger(ProcessManagerComponent.class, DuccComponent);
- private static DuccWorkHelper dwHelper = null;
-
// Dispatch component used to send messages to remote Agents
private DuccEventDispatcher eventDispatcher;
private int shareQuantum;
@@ -101,7 +91,6 @@ implements ProcessManager {
String.format(jobHeaderFormat,jobHeaderArray[0],jobHeaderArray[1],jobHeaderArray[2],
jobHeaderArray[3],jobHeaderArray[4],jobHeaderArray[5],jobHeaderArray[6],
jobHeaderArray[7],jobHeaderArray[8]+"\n");
- dwHelper = new DuccWorkHelper();
}
/**
@@ -149,13 +138,13 @@ implements ProcessManager {
Long.parseLong(processMemoryAssignment);
// Normalize memory requirements for JPs into Gigs
if ( units.equals(MemoryUnits.KB ) ) {
- normalizedProcessMemoryRequirements =
(int)normalizedProcessMemoryRequirements/(1024*1024);
+ normalizedProcessMemoryRequirements =
normalizedProcessMemoryRequirements/(1024*1024);
} else if ( units.equals(MemoryUnits.MB ) ) {
- normalizedProcessMemoryRequirements =
(int)normalizedProcessMemoryRequirements/1024;
+ normalizedProcessMemoryRequirements =
normalizedProcessMemoryRequirements/1024;
} else if ( units.equals(MemoryUnits.GB ) ) {
// already normalized
} else if ( units.equals(MemoryUnits.TB ) ) {
- normalizedProcessMemoryRequirements =
(int)normalizedProcessMemoryRequirements*1024;
+ normalizedProcessMemoryRequirements =
normalizedProcessMemoryRequirements*1024;
}
return normalizedProcessMemoryRequirements;
}
@@ -165,20 +154,6 @@ implements ProcessManager {
return shares;
}
- private String getCmdLine(ICommandLine iCommandLine) {
- StringBuffer sb = new StringBuffer();
- if(iCommandLine != null) {
- String[] commandLine = iCommandLine.getCommandLine();
- if(commandLine != null) {
- for(String item : commandLine) {
- sb.append(item);
- sb.append(" ");
- }
- }
- }
- return sb.toString();
- }
-
public void dispatchStateUpdateToAgents(Map<DuccId, IDuccWork> workMap,
long sequence) {
String methodName="dispatchStateUpdateToAgents";
try {
