[Swift-commit] r8063 - trunk/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2014-07-24 14:40:51 -0500 (Thu, 24 Jul 2014)
New Revision: 8063

Modified:
   trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
Log:
fixed improper jobThrottle and initialScore calculation from maxParallelTasks and initialParallelTasks (bug 1299)

Modified: trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2014-07-24 19:28:41 UTC (rev 8062)
+++ trunk/src/org/griphyn/vdl/karajan/VDSAdaptiveScheduler.java	2014-07-24 19:40:51 UTC (rev 8063)
@@ -480,10 +480,18 @@
             Object initialParallelJobs = bc.getProperty("initialParallelTasks");
             if (maxParallelJobs != null) {
                 double max = parseAndCheck(maxParallelJobs, "maxParallelTasks", bc);
-                bc.setProperty("jobThrottle", WeightedHost.jobThrottleFromMaxParallelism(max));
+                double jobThrottle = WeightedHost.jobThrottleFromMaxParallelism(max);
+                if (logger.isDebugEnabled()) {
+                    logger.debug(bc.getName() + ": jobThrottle = " + jobThrottle);
+                }
+                bc.setProperty("jobThrottle", jobThrottle);
                 if (initialParallelJobs != null) {
                     double initial = parseAndCheck(initialParallelJobs, "initialParallelTasks", bc);
-                    bc.setProperty("initialScore", WeightedHost.initialScoreFromInitialParallelism(initial, max));
+                    double initialScore = WeightedHost.initialScoreFromInitialParallelism(initial, max);
+                    if (logger.isDebugEnabled()) {
+                        logger.debug(bc.getName() + ": initialScore = " + initialScore);
+                    }
+                    bc.setProperty("initialScore", initialScore);
                 }
             }
             else if (initialParallelJobs != null) {