Author: challngr
Date: Tue Oct 28 11:07:44 2014
New Revision: 1634846
URL: http://svn.apache.org/r1634846
Log:
UIMA-4063 Update fudge for blasti-guard.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/SchedConstants.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1634846&r1=1634845&r2=1634846&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
Tue Oct 28 11:07:44 2014
@@ -58,6 +58,7 @@ public class ResourceManagerComponent
int initStability; // number of heartbeats from agent
metrics we must wait for during init befor starting
int nodeMetricsUpdateRate;
int orPublishingRate;
+ int minRmPublishingRate;
boolean schedulerReady = false;
ISchedulerMain scheduler;
@@ -188,6 +189,7 @@ public class ResourceManagerComponent
nodeMetricsUpdateRate =
SystemPropertyResolver.getIntProperty("ducc.agent.node.metrics.publish.rate",
DEFAULT_NODE_METRICS_RATE);
schedulingRatio =
SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.ratio",
DEFAULT_SCHEDULING_RATIO);
orPublishingRate =
SystemPropertyResolver.getIntProperty("ducc.orchestrator.abbreviated.state.publish.rate",
DEFAULT_OR_PUBLISH_RATE);
+ minRmPublishingRate = orPublishingRate +
DEFAULT_RM_PUBLISHING_SLOP;
// schedulingEpoch =
SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.rate",
DEFAULT_SCHEDULING_RATE);
String adminEndpoint =
System.getProperty("ducc.rm.admin.endpoint");
@@ -333,14 +335,14 @@ public class ResourceManagerComponent
// We try to set the minSchedulingRate to be something
reasonably less than
// the OR rate in order to be as responsive as possible.
long now = System.currentTimeMillis();
- if ( now - lastSchedule >= orPublishingRate ) {
+ if ( now - lastSchedule >= minRmPublishingRate ) {
converter.eventArrives(map);
if ( ((++epoch_counter) % schedulingRatio) == 0 ) {
notify();
}
lastSchedule = now;
} else {
- logger.warn(methodName, null, "-------> OR publication
ignored, arrived too soon (less than", orPublishingRate, "delay). Delay was",
(now-lastSchedule));
+ logger.warn(methodName, null, "-------> OR publication
ignored, arrived too soon (less than", minRmPublishingRate, "delay). Delay
was", (now-lastSchedule));
}
}
} catch ( Throwable e ) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/SchedConstants.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/SchedConstants.java?rev=1634846&r1=1634845&r2=1634846&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/SchedConstants.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/SchedConstants.java
Tue Oct 28 11:07:44 2014
@@ -38,6 +38,7 @@ public interface SchedConstants
public static final int DEFAULT_SCHEDULING_RATE = 60000;
public static final int DEFAULT_NODE_METRICS_RATE = 60000;
public static final int DEFAULT_OR_PUBLISH_RATE = 30000;
+ public static final int DEFAULT_RM_PUBLISHING_SLOP = 5000;
public static final int DEFAULT_PROCESSES = 10; // for
jobs, number of processes if not specified
public static final int DEFAULT_INSTANCES = 1; // for
reservations, number of instances if not specified
