Author: degenaro Date: Mon Feb 1 20:24:36 2016 New Revision: 1727997 URL: http://svn.apache.org/viewvc?rev=1727997&view=rev Log: UIMA-4779 DUCC Orchestrator (OR) remove Exceptions and WARNs
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1727997&r1=1727996&r2=1727997&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Mon Feb 1 20:24:36 2016 @@ -20,7 +20,6 @@ package org.apache.uima.ducc.orchestrato import java.io.File; import java.util.ArrayList; -import java.util.Enumeration; import java.util.List; import java.util.Map; @@ -106,21 +105,6 @@ public class JobFactory implements IJobF return retVal; } - private void checkSpec(DuccWorkJob job, JobRequestProperties jobRequestProperties) { - String methodName = "checkSpec"; - logger.trace(methodName, job.getDuccId(), "enter"); - jobRequestProperties.normalize(); - Enumeration<Object> keys = jobRequestProperties.keys(); - while(keys.hasMoreElements()) { - String key = (String) keys.nextElement(); - if(!jobRequestProperties.isRecognized(key)) { - logger.warn(methodName, job.getDuccId(), "unrecognized: "+key); - } - } - logger.trace(methodName, job.getDuccId(), "exit"); - return; - } - private ArrayList<String> toArrayList(String overrides) { String methodName = "toArrayList"; logger.trace(methodName, null, "enter"); @@ -502,7 +486,7 @@ public class JobFactory implements IJobF private DuccWorkJob create(CommonConfiguration common, JobRequestProperties jobRequestProperties, DuccWorkJob job) { String methodName = "create"; - checkSpec(job, jobRequestProperties); + jobRequestProperties.normalize(); DuccType duccType = job.getDuccType(); // Service Deployment Type if(jobRequestProperties.containsKey(ServiceRequestProperties.key_service_type_custom)) { Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java?rev=1727997&r1=1727996&r2=1727997&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java Mon Feb 1 20:24:36 2016 @@ -44,11 +44,22 @@ public class JobFactoryHelper { public static long getByteSizeJobProcess(String process_memory_size) { String location = "getByteSizeJobProcess"; long retVal = getDefaultByteSizeJobProcess(); - try { - retVal = Long.parseLong(process_memory_size); + if(process_memory_size != null) { + String memory_size = process_memory_size.trim(); + if(memory_size.length() > 0) { + try { + retVal = Long.parseLong(process_memory_size); + } + catch(Exception e) { + logger.error(location, jobid, e); + } + } + else { + logger.info(location, jobid, "memory size: empty"); + } } - catch(Exception e) { - logger.error(location, jobid, e); + else { + logger.info(location, jobid, "memory size: null"); } logger.debug(location, jobid, retVal); return retVal;