You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2015/12/21 16:34:18 UTC
svn commit: r1721195 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
Author: challngr
Date: Mon Dec 21 15:34:18 2015
New Revision: 1721195
URL: http://svn.apache.org/viewvc?rev=1721195&view=rev
Log:
UIMA-4712 - set service id for horizontal AP/Service allocation
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java?rev=1721195&r1=1721194&r2=1721195&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java Mon Dec 21 15:34:18 2015
@@ -108,6 +108,17 @@ public class JobManagerConverter
}
}
+ // UIMA-4712
+ long toLong(String s, long deflt)
+ {
+ try {
+ long val = Long.parseLong(s);
+ return ( val == 0L ) ? deflt : val;
+ } catch ( Throwable t ) {
+ return deflt;
+ }
+ }
+
void refuse(IRmJob j, String reason)
{
j.refuse(reason);
@@ -467,13 +478,6 @@ public class JobManagerConverter
* Convert a JobManager Job into a ResourceManager RmJob. We assume this job is NOT in
* our lists.
*
- * NOTE IMPORTANT NOTE
- *
- * Until Lou's job contains all required scheduling fields I do a conversion that enhances
- * what I receive with defaults so the scheduler can actually schedule the job.
- *
- * NOTE IMPORTANT NOTE
- *
* @param job
*/
boolean jobArrives(IDuccWork job)
@@ -514,6 +518,7 @@ public class JobManagerConverter
String user_name = sti.getUser().trim();
j.setUserName(user_name);
j.setJobName(name);
+ j.setServiceId(toLong(job.getServiceId(), 0L)); // UIMA-4712 only non-zero on actual service instances
int threads = toInt(si.getThreadsPerProcess(), scheduler.getDefaultNThreads());
int user_priority = toInt(si.getSchedulingPriority(), 100);