[Swift-commit] r4960 - branches/release-0.93/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-08-07 18:02:26 -0500 (Sun, 07 Aug 2011)
New Revision: 4960

Modified:
   branches/release-0.93/src/org/griphyn/vdl/karajan/HangChecker.java
Log:
disable hang checker messages if all sites are overloaded

Modified: branches/release-0.93/src/org/griphyn/vdl/karajan/HangChecker.java
===================================================================
--- branches/release-0.93/src/org/griphyn/vdl/karajan/HangChecker.java	2011-08-07 02:27:13 UTC (rev 4959)
+++ branches/release-0.93/src/org/griphyn/vdl/karajan/HangChecker.java	2011-08-07 23:02:26 UTC (rev 4960)
@@ -15,12 +15,11 @@
 import java.util.TimerTask;
 
 import org.apache.log4j.Logger;
-import org.globus.cog.karajan.scheduler.LateBindingScheduler;
+import org.globus.cog.karajan.scheduler.WeightedHostScoreScheduler;
 import org.globus.cog.karajan.stack.VariableStack;
 import org.globus.cog.karajan.workflow.ExecutionException;
 import org.globus.cog.karajan.workflow.events.EventBus;
 import org.globus.cog.karajan.workflow.nodes.grid.SchedulerNode;
-import org.griphyn.vdl.karajan.lib.VDLFunction;
 
 public class HangChecker extends TimerTask {
     public static final Logger logger = Logger.getLogger(HangChecker.class);
@@ -41,11 +40,11 @@
 
     public void run() {
         try {
-            LateBindingScheduler s = (LateBindingScheduler) stack.getGlobal(SchedulerNode.SCHEDULER);
+            WeightedHostScoreScheduler s = (WeightedHostScoreScheduler) stack.getGlobal(SchedulerNode.SCHEDULER);
             if (s != null) {
                 int running = s.getRunning();
-
-                if (running == 0 && EventBus.eventCount == lastEventCount) {
+                boolean allOverloaded = s.allOverloaded();
+                if (running == 0 && EventBus.eventCount == lastEventCount && !allOverloaded) {
                     logger.warn("No events in " + (CHECK_INTERVAL / 1000) + "s.");
                     ByteArrayOutputStream os = new ByteArrayOutputStream();
                     PrintStream ps = new PrintStream(os);