Author: challngr
Date: Wed Mar 27 18:20:07 2013
New Revision: 1461765
URL: http://svn.apache.org/r1461765
Log:
UIMA-2772
Cleanup - property show config parms in RM log at startup. Set default for
ducc.rm.fast.restart to 'false'.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties?rev=1461765&r1=1461764&r2=1461765&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties Wed Mar 27
18:20:07 2013
@@ -186,7 +186,11 @@ ducc.orchestrator.node=${ducc.head}
# Resource Manager Configuration block
ducc.rm.configuration.class=org.apache.uima.ducc.rm.config.ResourceManagerConfiguration
+# Queue name for broadcast RM state
ducc.rm.state.update.endpoint=ducc.rm.state
+# If enabled, RM tries to start as soon as it recoveres state from an OR
publication,
+# instread of waiting for init.stability for nodes to check in.
+ducc.rm.fast.recovery = false
# endpoint type choices[vm,queue,topic]
ducc.rm.state.update.endpoint.type=topic
# This is the scheduling epoch in milliseconds. We publish at the end of each
epoch.
@@ -197,7 +201,6 @@ ducc.rm.reserved.dram = 0
# Base size of dram quantum in Gb
ducc.rm.share.quantum = 4
# Implementation class for actual scheduling algorithm
-#ducc.rm.scheduler =
org.apache.uima.ducc.sm.pm.orchestrator.agent.jd.rm.rm.scheduler.ClassBasedScheduler
ducc.rm.scheduler = org.apache.uima.ducc.rm.scheduler.NodepoolScheduler
# File defining thescheduler classes - found in DUCC_HOME/resources
ducc.rm.class.definitions = ducc.classes
@@ -223,8 +226,12 @@ ducc.rm.expand.by.doubling = true
ducc.rm.prediction = true
# Add this fudge factor (milliseconds) to the expansion target when using
prediction
ducc.rm.prediction.fudge = 120000
+# If enabled, RM insures every job has a "foot in the door", some minimum
number of processes, and if not
+# attempts to find space for under-provisioned jobs by taking shares from
"rich" jobs. Note this may
+# not always be possible if the cluster itseslf is under-provisioned for the
load.
ducc.rm.defragmentation = true
-# What is minimum number of shares before we do defrag?
+# What is minimum number of processes for a job before we do defrag? If a job
has less than this amount
+# RM may attempt defragmentation to bring the processes up to this value.
ducc.rm.fragmentation.threshold = 2
# Agent Configuration block
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1461765&r1=1461764&r2=1461765&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Wed Mar 27 18:20:07 2013
@@ -121,9 +121,11 @@ public class Scheduler
// 4 - defrag code complete
// beta - not yet "real"!
//
+ // Bring up to speed with rest of ducc version. 2013-03-06 jrc
+ //
final static int rmversion_major = 0;
- final static int rmversion_minor = 6;
- final static int rmversion_ptf = 4;
+ final static int rmversion_minor = 8;
+ final static int rmversion_ptf = 0;
final static String rmversion_string = "beta";
boolean initialized = false; // we refuse nodeupdates until this
is true
@@ -197,12 +199,13 @@ public class Scheduler
logger.info(methodName, null, " default tasks
: ", defaultNTasks);
logger.info(methodName, null, " default memory
: ", defaultMemory);
logger.info(methodName, null, " class definition
file : ", class_definitions);
- logger.info(methodName, null, " RM:OR scheduling
ratio : ",
SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.ratio",
-
DEFAULT_SCHEDULING_RATIO) +
":1");
logger.info(methodName, null, " eviction policy
: ", evictionPolicy);
logger.info(methodName, null, " use prediction
: ", SystemPropertyResolver.getBooleanProperty("ducc.rm.prediction",
true));
logger.info(methodName, null, " prediction fudge
factor : ", SystemPropertyResolver.getIntProperty("ducc.rm.prediction.fudge",
10000));
logger.info(methodName, null, " node stability
: ", nodeStability);
+ logger.info(methodName, null, " init stability
: ", SystemPropertyResolver.getIntProperty("ducc.rm.init.stability"));
+ logger.info(methodName, null, " fast recovery
: ", SystemPropertyResolver.getBooleanProperty("ducc.rm.fast.recovery",
true));
+ logger.info(methodName, null, " RM publish rate
: ", SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.rate",
60));
logger.info(methodName, null, " metrics update
rate : ",
SystemPropertyResolver.getIntProperty("ducc.agent.node.metrics.publish.rate",
DEFAULT_NODE_METRICS_RATE));
logger.info(methodName, null, " initialization
cap : ",
SystemPropertyResolver.getIntProperty("ducc.rm.initialization.cap"));
