You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/08/30 07:05:28 UTC
svn commit: r1700090 - in /oodt/trunk: CHANGES.txt
resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
Author: mattmann
Date: Sun Aug 30 05:05:28 2015
New Revision: 1700090
URL: http://svn.apache.org/r1700090
Log:
Fix for OODT-244: Allow the Resource Manager scheduler to cycle on a non-integer number of seconds contributed by Gabe Resneck.
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1700090&r1=1700089&r2=1700090&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sun Aug 30 05:05:28 2015
@@ -2,6 +2,9 @@ Apache OODT Change Log
======================
Release 0.10 - Current Development
+* OODT-244 Allow the Resource Manager scheduler to cycle on a non-integer
+ number of seconds (Gabe Resneck via mattmann)
+
* OODT-864 Upgrade to Tika 1.10 (mattmann,tpalsulich)
* OODT-686 AddProductTypeCliAction should prompt for ProductTypeId (rverma, mattmann)
Modified: oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java?rev=1700090&r1=1700089&r2=1700090&view=diff
==============================================================================
--- oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java (original)
+++ oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/LRUScheduler.java Sun Aug 30 05:05:28 2015
@@ -19,7 +19,7 @@
package org.apache.oodt.cas.resource.scheduler;
//JDKimports
-import java.lang.Integer;
+import java.lang.Double;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -63,7 +63,7 @@ public class LRUScheduler implements Sch
private JobQueue myJobQueue;
/* our wait time between checking the queue */
- private int waitTime = -1;
+ private double waitTime = -1;
public LRUScheduler(Monitor m, Batchmgr b, JobQueue q, LRUQueueManager qm) {
@@ -74,7 +74,7 @@ public class LRUScheduler implements Sch
String waitStr = System.getProperty(
"org.apache.oodt.cas.resource.scheduler.wait.seconds", "20");
- waitTime = Integer.parseInt(waitStr);
+ waitTime = Double.parseDouble(waitStr);
}
/*
@@ -86,7 +86,8 @@ public class LRUScheduler implements Sch
for (;;) {
try {
- Thread.currentThread().sleep((long) waitTime * 1000);
+ long sleepTime = (long)(waitTime * 1000.0);
+ Thread.currentThread().sleep(sleepTime);
} catch (Exception ignore) {}
if (!myJobQueue.isEmpty()) {