[Cogkit-svn] SF.net SVN: cogkit:[2121] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/scheduler

[<ha...@us...>]

Revision: 2121
          http://cogkit.svn.sourceforge.net/cogkit/?rev=2121&view=rev
Author:   hategan
Date:     2008-07-30 01:31:02 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
disabled delayed factoring

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java	2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/OverloadedHostMonitor.java	2008-07-30 01:31:02 UTC (rev 2121)
@@ -51,7 +51,6 @@
 						while (i.hasNext()) {
 							WeightedHost wh = (WeightedHost) i.next();
 							if (wh.isOverloaded() == 0) {
-								System.err.println("Removing " + wh.getHost());
 								whss.removeOverloaded(wh);
 								i.remove();
 							}

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java	2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java	2008-07-30 01:31:02 UTC (rev 2121)
@@ -142,6 +142,9 @@
 	}
 
 	protected synchronized void factorScoreLater(WeightedHost wh, double factor) {
+		if (logger.isDebugEnabled()) {
+			logger.debug("factorLater(" + wh + ", " + factor + ")");
+		}
 		wh.setDelayedDelta(wh.getDelayedDelta() + factor);
 	}
 
@@ -242,6 +245,9 @@
 			if (wh != null) {
 				change = true;
 				sorted.changeLoad(wh, -1);
+				if (logger.isDebugEnabled()) {
+					logger.debug("commitDelayedScore(" + wh + ", " + wh.getDelayedDelta());
+				}
 				sorted.changeScore(wh, wh.getScore() + wh.getDelayedDelta());
 			}
 			else {
@@ -474,7 +480,8 @@
 			BoundContact bc = (BoundContact) contacts[i];
 			WeightedHost wh = sorted.findHost(bc);
 			if (wh != null) {
-				factorScoreLater(wh, factor);
+				//factorScoreLater(wh, factor);
+				factorScore(wh, factor);
 			}
 		}
 	}

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java	2008-07-30 00:54:53 UTC (rev 2120)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostSet.java	2008-07-30 01:31:02 UTC (rev 2121)
@@ -81,7 +81,6 @@
 			addOverloaded(wh);
 		}
 		else if (v < 0) {
-			System.err.println(wh.getHost() + " : " + v);
 			if (monitor != null) {
 				monitor.add(wh);
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.