cogkit-svn — SVN update notifications are sent to this mailing list

[Cogkit-svn] SF.net SVN: cogkit: [1921] branches/4.1.6/src/cog/modules/provider-gt4_0_0/ CHANGES.txt

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

Revision: 1921
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1921&view=rev
Author:   hategan
Date:     2008-02-25 13:38:13 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
changes

Modified Paths:
--------------
    branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt

Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt
===================================================================
--- branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt	2008-02-25 21:31:42 UTC (rev 1920)
+++ branches/4.1.6/src/cog/modules/provider-gt4_0_0/CHANGES.txt	2008-02-25 21:38:13 UTC (rev 1921)
@@ -1,3 +1,8 @@
+(02/25/2008)
+
+*** Updated axis and wsrf jars to fix a scalability problem
+    with notifications.
+
 (02/11/2008)
 
 *** Updated gram jars to 4.0.6 plus a scalability patch.


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

[Cogkit-svn] SF.net SVN: cogkit: [1920] branches/4.1.6/src/cog/modules/provider-gt4_0_0/ lib-gt4_0_0

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

Revision: 1920
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1920&view=rev
Author:   hategan
Date:     2008-02-25 13:31:42 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
updated axis and some wsrf jars; this is from wsrf tag "cog_4_1_6_rc1"

Modified Paths:
--------------
    branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
    branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core.jar
    branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
    branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_tools.jar

Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/axis.jar
===================================================================
(Binary files differ)

Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core.jar
===================================================================
(Binary files differ)

Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_core_stubs.jar
===================================================================
(Binary files differ)

Modified: branches/4.1.6/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/wsrf_tools.jar
===================================================================
(Binary files differ)


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

[Cogkit-svn] SF.net SVN: cogkit: [1919] branches/4.1.6/src/cog/modules/abstraction/ dependencies.xml

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

Revision: 1919
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1919&view=rev
Author:   hategan
Date:     2008-02-25 13:24:27 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
added dcache provider as dependency

Modified Paths:
--------------
    branches/4.1.6/src/cog/modules/abstraction/dependencies.xml

Modified: branches/4.1.6/src/cog/modules/abstraction/dependencies.xml
===================================================================
--- branches/4.1.6/src/cog/modules/abstraction/dependencies.xml	2008-02-25 20:41:42 UTC (rev 1918)
+++ branches/4.1.6/src/cog/modules/abstraction/dependencies.xml	2008-02-25 21:24:27 UTC (rev 1919)
@@ -29,6 +29,9 @@
 	  <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-localscheduler"/>
 	  </ant>
+	  <ant antfile="${main.buildfile}" target="dep">
+		<property name="module" value="provider-dcache"/>
+	  </ant>
 	  <!-- <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-ws"/>
 	  </ant>-->


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

[Cogkit-svn] SF.net SVN: cogkit: [1918] branches/4.1.6/src/cog/bin/release/Makefile

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

Revision: 1918
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1918&view=rev
Author:   hategan
Date:     2008-02-25 12:41:42 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
updated makefile

Modified Paths:
--------------
    branches/4.1.6/src/cog/bin/release/Makefile

Modified: branches/4.1.6/src/cog/bin/release/Makefile
===================================================================
--- branches/4.1.6/src/cog/bin/release/Makefile	2008-02-25 20:24:29 UTC (rev 1917)
+++ branches/4.1.6/src/cog/bin/release/Makefile	2008-02-25 20:41:42 UTC (rev 1918)
@@ -8,8 +8,8 @@
 export CVSROOT
 #must be after the above
 VERSION=$(shell release.sh cogversion $(CVSROOT) $(TAG))
-EXCLUDEMODULES=qos common portlets template monitor provider-gt3_0_2 provider-gt3_2_0 broker provider-ws provider-mpichg2
-PROVIDERS=gt4_0_0 webdav ssh condor gt2ft
+EXCLUDEMODULES=qos common portlets template monitor provider-gt3_0_2 provider-gt3_2_0 broker provider-ws provider-mpichg2 workflow-repo-gui repository
+PROVIDERS=gt4_0_0 webdav ssh condor localscheduler dcache
 #PUB...@ww...
 PUB...@ww...
 #PUBLISHROOT=/www/www.cogkit/org/release


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

[Cogkit-svn] SF.net SVN: cogkit: [1917] branches/4.1.6/src/cog/modules/gridfaces/src/org /globus/cog/gridface

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

Revision: 1917
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1917&view=rev
Author:   hategan
Date:     2008-02-25 12:24:29 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
fixed (relatively speaking) to work with api changes in abstractions

Modified Paths:
--------------
    branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java
    branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java
    branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java

Modified: branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java
===================================================================
--- branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java	2008-02-25 20:09:57 UTC (rev 1916)
+++ branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/commands/GridCommandImpl.java	2008-02-25 20:24:29 UTC (rev 1917)
@@ -541,15 +541,10 @@
         return attributes;
     }
     
-	public Calendar getCompletedTime() {
-		return this.task.getCompletedTime();
-	}
 	public Integer getId() {
 		return this.id;
 	}
-	public Calendar getSubmittedTime() {
-		return this.task.getSubmittedTime();
-	}
+	
 	public Task getTask() {
 		return this.task;
 	}

Modified: branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java
===================================================================
--- branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java	2008-02-25 20:09:57 UTC (rev 1916)
+++ branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/impl/desktop/util/GCMLoggerTable.java	2008-02-25 20:24:29 UTC (rev 1917)
@@ -503,21 +503,22 @@
 				case DIRECTORY_COL:
 					return (String)command.getAttribute("directory");
 				case SUBMITTIME_COL :
-					if (command.getSubmittedTime() != null) {
-						String submitTime = sdf.format(command
-							.getSubmittedTime().getTime());
-						return submitTime;
-					} else {
+					//TODO who is supposed to maintain this?
+					//if (command.getSubmittedTime() != null) {
+					//	String submitTime = sdf.format(command
+					//		.getSubmittedTime().getTime());
+					//	return submitTime;
+					//} else {
 						return "Not available";
-					}
+					//}
 				case COMPLETETIME_COL :
-					if (command.getCompletedTime() != null) {
-						String submitTime = sdf.format(command
-							.getCompletedTime().getTime());
-						return submitTime;
-					} else {
+					//if (command.getCompletedTime() != null) {
+					//	String submitTime = sdf.format(command
+					//		.getCompletedTime().getTime());
+					//	return submitTime;
+					//} else {
 						return "Not available";
-					}
+					//}
 				case PROVIDER_COL :
 					return command.getAttribute("provider");
 				case SERVICE_COL :

Modified: branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java
===================================================================
--- branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java	2008-02-25 20:09:57 UTC (rev 1916)
+++ branches/4.1.6/src/cog/modules/gridfaces/src/org/globus/cog/gridface/interfaces/GridCommand.java	2008-02-25 20:24:29 UTC (rev 1917)
@@ -71,10 +71,6 @@
 
     /** validate the given command and return true or false */
     public boolean validate();
-
-    public Calendar getSubmittedTime();
-
-    public Calendar getCompletedTime();
     
     /** Get output of the given command when status changes to COMPLETED */
     public Object getOutput();


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

[Cogkit-svn] SF.net SVN: cogkit: [1916] branches/4.1.6/src/cog/modules/gridshell/src/org /globus/cog/gridshell/commands/AbstractCommand.java

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

Revision: 1916
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1916&view=rev
Author:   hategan
Date:     2008-02-25 12:09:57 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
updated to work with api change in abstractions

Modified Paths:
--------------
    branches/4.1.6/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java

Modified: branches/4.1.6/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java
===================================================================
--- branches/4.1.6/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java	2008-02-25 17:41:55 UTC (rev 1915)
+++ branches/4.1.6/src/cog/modules/gridshell/src/org/globus/cog/gridshell/commands/AbstractCommand.java	2008-02-25 20:09:57 UTC (rev 1916)
@@ -5,7 +5,7 @@
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -200,10 +200,10 @@
 			public String getMessage() {
 				return status.getMessage();
 			}
-			public void setTime(Calendar time) {
+			public void setTime(Date time) {
 				status.setTime(time);
 			}
-			public Calendar getTime() {
+			public Date getTime() {
 				return status.getTime();
 			}
 			public boolean isTerminal() {


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

[Cogkit-svn] SF.net SVN: cogkit: [1915] branches/4.1.6/src/cog/bin/release/metaindex.k

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

Revision: 1915
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1915&view=rev
Author:   hategan
Date:     2008-02-25 09:41:55 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
use svn

Modified Paths:
--------------
    branches/4.1.6/src/cog/bin/release/metaindex.k

Modified: branches/4.1.6/src/cog/bin/release/metaindex.k
===================================================================
--- branches/4.1.6/src/cog/bin/release/metaindex.k	2008-02-25 17:13:07 UTC (rev 1914)
+++ branches/4.1.6/src/cog/bin/release/metaindex.k	2008-02-25 17:41:55 UTC (rev 1915)
@@ -75,7 +75,7 @@
 				if(file:exists("{file}.png")
 					img(src="{file}.png")
 				)
-				a(href="http://www.cogkit.org/viewcvs/viewcvs.cgi/src/cog/modules/{module}/{file}?rev=cog_{cog:version}&content-type=text/vnd.viewcvs-markup", file)
+				a(href="http://cogkit.svn.sourceforge.net/viewvc/cogkit/tags/{cog:version}/src/cog/modules/{module}/{file}", file)
 			)
 		)
 	)
@@ -135,4 +135,4 @@
 	)
 )
 
-main()
\ No newline at end of file
+main()


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

[Cogkit-svn] SF.net SVN: cogkit: [1914] branches/4.1.6/src/cog/VERSION

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

Revision: 1914
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1914&view=rev
Author:   hategan
Date:     2008-02-25 09:13:07 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
changed version

Modified Paths:
--------------
    branches/4.1.6/src/cog/VERSION

Modified: branches/4.1.6/src/cog/VERSION
===================================================================
--- branches/4.1.6/src/cog/VERSION	2008-02-23 01:26:41 UTC (rev 1913)
+++ branches/4.1.6/src/cog/VERSION	2008-02-25 17:13:07 UTC (rev 1914)
@@ -1 +1 @@
-cog.version = 4_1_6_dev
+cog.version = 4_1_6_rc1


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

[Cogkit-svn] SF.net SVN: cogkit: [1913] trunk/current/src/cog/bin/release/metaindex.k

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

Revision: 1913
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1913&view=rev
Author:   hategan
Date:     2008-02-22 17:26:41 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
updated metaindex to point to svn instead of cvs

Modified Paths:
--------------
    trunk/current/src/cog/bin/release/metaindex.k

Modified: trunk/current/src/cog/bin/release/metaindex.k
===================================================================
--- trunk/current/src/cog/bin/release/metaindex.k	2008-02-23 01:20:16 UTC (rev 1912)
+++ trunk/current/src/cog/bin/release/metaindex.k	2008-02-23 01:26:41 UTC (rev 1913)
@@ -75,7 +75,7 @@
 				if(file:exists("{file}.png")
 					img(src="{file}.png")
 				)
-				a(href="http://www.cogkit.org/viewcvs/viewcvs.cgi/src/cog/modules/{module}/{file}?rev=cog_{cog:version}&content-type=text/vnd.viewcvs-markup", file)
+				a(href="http://cogkit.svn.sourceforge.net/viewvc/cogkit/tags/{cog:version}/src/cog/modules/{module}/{file}", file)
 			)
 		)
 	)
@@ -135,4 +135,4 @@
 	)
 )
 
-main()
\ No newline at end of file
+main()


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

[Cogkit-svn] SF.net SVN: cogkit: [1912] tags/4.1.6rc1/

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

Revision: 1912
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1912&view=rev
Author:   hategan
Date:     2008-02-22 17:20:16 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
Tagging branches/4.1.6 as tags/4.1.6rc1

Added Paths:
-----------
    tags/4.1.6rc1/

Copied: tags/4.1.6rc1 (from rev 1911, branches/4.1.6)


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

[Cogkit-svn] SF.net SVN: cogkit: [1911] branches/4.1.6/

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

Revision: 1911
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1911&view=rev
Author:   hategan
Date:     2008-02-22 17:17:10 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
branching 4.1.6

Added Paths:
-----------
    branches/4.1.6/

Copied: branches/4.1.6 (from rev 1910, trunk/current)


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

[Cogkit-svn] SF.net SVN: cogkit: [1910] trunk/current/src/cog/modules/jglobus/lib

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

Revision: 1910
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1910&view=rev
Author:   hategan
Date:     2008-02-22 17:15:53 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
updated to include gridftp connect timeout patch

Modified Paths:
--------------
    trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080222.jar
    trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080222.jar

Modified: trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080222.jar
===================================================================
(Binary files differ)

Modified: trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080222.jar
===================================================================
(Binary files differ)


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

[Cogkit-svn] SF.net SVN: cogkit: [1909] trunk/current/src/cog/modules/jglobus

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

Revision: 1909
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1909&view=rev
Author:   hategan
Date:     2008-02-22 13:23:56 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
updated jglobus

Modified Paths:
--------------
    trunk/current/src/cog/modules/jglobus/project.properties

Added Paths:
-----------
    trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080222.jar
    trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080222.jar

Removed Paths:
-------------
    trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080204.jar
    trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080204.jar

Deleted: trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080204.jar
===================================================================
(Binary files differ)

Added: trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080222.jar
===================================================================
(Binary files differ)


Property changes on: trunk/current/src/cog/modules/jglobus/lib/cog-jglobus-dev-080222.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080204.jar
===================================================================
(Binary files differ)

Added: trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080222.jar
===================================================================
(Binary files differ)


Property changes on: trunk/current/src/cog/modules/jglobus/lib/cog-jobmanager-dev-080222.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/current/src/cog/modules/jglobus/project.properties
===================================================================
--- trunk/current/src/cog/modules/jglobus/project.properties	2008-02-22 16:32:52 UTC (rev 1908)
+++ trunk/current/src/cog/modules/jglobus/project.properties	2008-02-22 21:23:56 UTC (rev 1909)
@@ -1,6 +1,6 @@
 module.name 	= jglobus
 long.name 	= JGlobus
-version		= dev-080204
+version		= dev-080222
 project		= Java CoG Kit
 no.javadoc.compile = true
 lib.deps	= cog-jglobus-*.*,cryptix.*,cryptix32.*,jgss.*,jce-jdk13-131.*,cryptix-asn1.*,junit.*,puretls.*,log4j*.*,commons-logging*.*


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

[Cogkit-svn] SF.net SVN: cogkit: [1908] trunk/current/src/cog/modules/karajan

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

Revision: 1908
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1908&view=rev
Author:   hategan
Date:     2008-02-22 08:32:52 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
added dateFormat

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/CHANGES.txt
    trunk/current/src/cog/modules/karajan/resources/sys-common.xml

Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt	2008-02-22 16:31:35 UTC (rev 1907)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt	2008-02-22 16:32:52 UTC (rev 1908)
@@ -1,3 +1,7 @@
+(02/22/2008)
+
+*** Added sys:dateFormat(pattern, value)
+
 (02/12/2008)
 
 *** Added the maxSubmissionTime parameter to the score scheduler.

Modified: trunk/current/src/cog/modules/karajan/resources/sys-common.xml
===================================================================
--- trunk/current/src/cog/modules/karajan/resources/sys-common.xml	2008-02-22 16:31:35 UTC (rev 1907)
+++ trunk/current/src/cog/modules/karajan/resources/sys-common.xml	2008-02-22 16:32:52 UTC (rev 1908)
@@ -47,6 +47,7 @@
 	</namespace>
     
     <export name="numberFormat"><elementDef classname="org.globus.cog.karajan.workflow.nodes.functions.Misc"/></export>
+    <export name="dateFormat"><elementDef classname="org.globus.cog.karajan.workflow.nodes.functions.Misc"/></export>
     <export name="contains"><elementDef classname="org.globus.cog.karajan.workflow.nodes.functions.Misc"/></export>
 	<export name="file:contains" restricted="true"><elementDef classname="org.globus.cog.karajan.workflow.nodes.functions.Misc"/></export>
     <export name="UID"><elementDef classname="org.globus.cog.karajan.workflow.nodes.functions.Misc"/></export>


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

[Cogkit-svn] SF.net SVN: cogkit: [1907] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/workflow/nodes/functions/Misc.java

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

Revision: 1907
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1907&view=rev
Author:   hategan
Date:     2008-02-22 08:31:35 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
added date format

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java	2008-02-22 16:25:16 UTC (rev 1906)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/functions/Misc.java	2008-02-22 16:31:35 UTC (rev 1907)
@@ -18,8 +18,10 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
+import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -104,7 +106,16 @@
 		DecimalFormat df = new DecimalFormat(TypeUtil.toString(PA_PATTERN.getValue(stack)));
 		return df.format(TypeUtil.toDouble(PA_VALUE.getValue(stack)));
 	}
+	
+	static {
+        setArguments("sys_dateformat", new Arg[] { PA_PATTERN, PA_VALUE });
+    }
 
+    public Object sys_dateformat(VariableStack stack) throws ExecutionException {
+        DateFormat df = new SimpleDateFormat(TypeUtil.toString(PA_PATTERN.getValue(stack)));
+        return df.format(PA_VALUE.getValue(stack));
+    }
+
 	static {
 		setArguments("sys_readfile", new Arg[] { PA_FILE });
 		addAlias("sys_file_read", "sys_readfile");


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

[Cogkit-svn] SF.net SVN: cogkit: [1906] trunk/current/src/cog/modules/karajan/resources/ dag.k

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

Revision: 1906
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1906&view=rev
Author:   hategan
Date:     2008-02-22 08:25:16 -0800 (Fri, 22 Feb 2008)

Log Message:
-----------
added dag.k

Added Paths:
-----------
    trunk/current/src/cog/modules/karajan/resources/dag.k

Added: trunk/current/src/cog/modules/karajan/resources/dag.k
===================================================================
--- trunk/current/src/cog/modules/karajan/resources/dag.k	                        (rev 0)
+++ trunk/current/src/cog/modules/karajan/resources/dag.k	2008-02-22 16:25:16 UTC (rev 1906)
@@ -0,0 +1,63 @@
+import("sys.k")
+
+element(execdag, [nodes, edges]
+	nmap := map(each(nodes))
+	emap := map(each(edges))
+
+	fmap := map(
+		for(id, nmap, map:entry(id, channel()))
+	)
+
+	ins := map(
+		for(e, emap
+			for(oe, map:get(e, emap), map:entry(oe, true))
+		)
+	)
+
+	starts := list(
+		for(n, nmap, 
+			if(not(map:contains(n, ins)) n)
+		)
+	)
+
+	/*print("Nmap: ", nmap)
+	print("Emap: ", emap)
+	print("Fmap: ", fmap)
+	print("Ins: ", ins)
+	print("Starts: ", starts)*/
+	
+	for(s, starts
+		append(map:get(s, fmap), true)
+	)
+
+	uparallelFor(id, nmap
+		first(map:get(id, fmap))
+		executeElement(map:get(id, nmap))
+		oute := map:get(id, emap)
+		for(e, oute
+			append(map:get(e, fmap), true)
+		)
+	)
+)
+
+namespace(prefix="dag"
+	export(dag, 
+		element([channel(edges), channel(nodes)]
+			execdag(nodes, edges)
+		)
+	)
+	
+	export(node
+		element([id, lambda, channel(eto)]
+			to(nodes, map:entry(id, lambda))
+			to(edges, map:entry(id, join(each(eto))))
+		)
+	)
+	
+	export(edges
+		element([optional(to), ...]
+			to(eto, maybe(to))
+			to(eto, ...)
+		)
+	)
+)


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

[Cogkit-svn] SF.net SVN: cogkit: [1905] trunk/current/src/cog/modules/provider-gt4_0_0/ lib-gt4_0_0/gram-client.jar

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

Revision: 1905
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1905&view=rev
Author:   hategan
Date:     2008-02-19 20:38:47 -0800 (Tue, 19 Feb 2008)

Log Message:
-----------
the patched gram client had a small problem with batch jobs; this commit fixes it

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/gram-client.jar

Modified: trunk/current/src/cog/modules/provider-gt4_0_0/lib-gt4_0_0/gram-client.jar
===================================================================
(Binary files differ)


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

[Cogkit-svn] SF.net SVN: cogkit: [1904] trunk/current/src/cog/modules/abstraction/ dependencies.xml

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

Revision: 1904
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1904&view=rev
Author:   hategan
Date:     2008-02-12 16:00:19 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
removed gt2ft dependency

Modified Paths:
--------------
    trunk/current/src/cog/modules/abstraction/dependencies.xml

Modified: trunk/current/src/cog/modules/abstraction/dependencies.xml
===================================================================
--- trunk/current/src/cog/modules/abstraction/dependencies.xml	2008-02-12 20:44:18 UTC (rev 1903)
+++ trunk/current/src/cog/modules/abstraction/dependencies.xml	2008-02-13 00:00:19 UTC (rev 1904)
@@ -7,9 +7,9 @@
 	  <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-gt2"/>
 	  </ant>
-	  <ant antfile="${main.buildfile}" target="dep">
+	  <!--<ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-gt2ft"/>
-	  </ant>
+	  </ant>-->
 	  
 	  <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-gt4_0_0"/>
@@ -26,6 +26,9 @@
 	  <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-local"/>
 	  </ant>
+	  <ant antfile="${main.buildfile}" target="dep">
+		<property name="module" value="provider-localscheduler"/>
+	  </ant>
 	  <!-- <ant antfile="${main.buildfile}" target="dep">
 		<property name="module" value="provider-ws"/>
 	  </ant>-->


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

[Cogkit-svn] SF.net SVN: cogkit: [1903] trunk/current/src/cog/modules/abstraction-common /src/org/globus/cog/abstraction/xml/TaskMarshaller.java

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

Revision: 1903
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1903&view=rev
Author:   hategan
Date:     2008-02-12 12:44:18 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
fixed a bit of a problem there

Modified Paths:
--------------
    trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java

Modified: trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java
===================================================================
--- trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java	2008-02-12 20:20:25 UTC (rev 1902)
+++ trunk/current/src/cog/modules/abstraction-common/src/org/globus/cog/abstraction/xml/TaskMarshaller.java	2008-02-12 20:44:18 UTC (rev 1903)
@@ -82,11 +82,11 @@
         setSpecification(task, xmlTask);
 
         // set the task attributes
-        Enumeration en = task.getAllAttributes();
+        Iterator en = task.getAttributeNames().iterator();
         AttributeList list = new AttributeList();
-        while (en.hasMoreElements()) {
+        while (en.hasNext()) {
             Attribute attribute = new Attribute();
-            String attrName = (String) en.nextElement();
+            String attrName = (String) en.next();
             attribute.setName(attrName);
             attribute.setValue((String) task.getAttribute(attrName));
             list.addAttribute(attribute);


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

[Cogkit-svn] SF.net SVN: cogkit: [1902] trunk/current/src/cog/modules/provider-gt2/src/ org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java

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

Revision: 1902
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1902&view=rev
Author:   hategan
Date:     2008-02-12 12:20:25 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
fixed npe

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java

Modified: trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java	2008-02-12 20:20:02 UTC (rev 1901)
+++ trunk/current/src/cog/modules/provider-gt2/src/org/globus/cog/abstraction/impl/execution/gt2/JobSubmissionTaskHandler.java	2008-02-12 20:20:25 UTC (rev 1902)
@@ -67,7 +67,7 @@
             throw new TaskSubmissionException(
                     "JobSubmissionTaskHandler cannot handle two active jobs simultaneously");
         }
-        if (this.task.getStatus().getStatusCode() != Status.UNSUBMITTED) {
+        if (task.getStatus().getStatusCode() != Status.UNSUBMITTED) {
             throw new TaskSubmissionException("This task is already submitted");
         }
         this.task = task;


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

[Cogkit-svn] SF.net SVN: cogkit: [1901] trunk/current/src/cog/modules/provider-local/src /org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler. java

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

Revision: 1901
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1901&view=rev
Author:   hategan
Date:     2008-02-12 12:20:02 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
fixed npe

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java

Modified: trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java
===================================================================
--- trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java	2008-02-12 17:58:19 UTC (rev 1900)
+++ trunk/current/src/cog/modules/provider-local/src/org/globus/cog/abstraction/impl/execution/local/JobSubmissionTaskHandler.java	2008-02-12 20:20:02 UTC (rev 1901)
@@ -55,7 +55,7 @@
             throw new TaskSubmissionException(
                     "JobSubmissionTaskHandler cannot handle two active jobs simultaneously");
         }
-        else if (this.task.getStatus().getStatusCode() != Status.UNSUBMITTED) {
+        else if (task.getStatus().getStatusCode() != Status.UNSUBMITTED) {
             throw new TaskSubmissionException("Task is not in unsubmitted state");
         }
         else {


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

[Cogkit-svn] SF.net SVN: cogkit: [1900] trunk/current/src/cog/modules/karajan/CHANGES. txt

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

Revision: 1900
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1900&view=rev
Author:   hategan
Date:     2008-02-12 09:58:19 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
changes

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/CHANGES.txt

Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt	2008-02-12 17:43:46 UTC (rev 1899)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt	2008-02-12 17:58:19 UTC (rev 1900)
@@ -1,3 +1,14 @@
+(02/12/2008)
+
+*** Added the maxSubmissionTime parameter to the score scheduler.
+    It's not strictly enforced, but the submission time of a job
+    submission task is now part of the feedback loop. The submission
+    time contributes to the score linearly and in addition to the other
+    things (such as successFactor). If the submission time
+    is 0.5s, the contribution is 0. If the submission time of a job
+    is exactly maxSubmissionTime, then the contribution is 
+    -successFactor.
+
 (02/11/2008)
 
 *** Added some code to store stack frames of less than 5 elements


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

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

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

Revision: 1899
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1899&view=rev
Author:   hategan
Date:     2008-02-12 09:43:46 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
jobThrottle now a float; time it takes to submit a job is now in the score feedback loop. by default it is set to stabilize at 20s submission time

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

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/AbstractScheduler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/AbstractScheduler.java	2008-02-12 17:36:49 UTC (rev 1898)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/AbstractScheduler.java	2008-02-12 17:43:46 UTC (rev 1899)
@@ -197,12 +197,21 @@
 	
 	protected int throttleValue(Object value) {
 	    if ("off".equalsIgnoreCase(value.toString())) {
-	        return THROTTLE_OFF; 
+	        return THROTTLE_OFF;
 	    }
 	    else {
 	        return TypeUtil.toInt(value);
 	    }
 	}
+	
+	protected float floatThrottleValue(Object value) {
+	    if ("off".equalsIgnoreCase(value.toString())) {
+	        return THROTTLE_OFF;
+	    }
+	    else {
+	        return (float) TypeUtil.toDouble(value);
+	    }
+	}
 
 	public Object getProperty(String name) {
 		return properties.get(name);

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java	2008-02-12 17:36:49 UTC (rev 1898)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHost.java	2008-02-12 17:43:46 UTC (rev 1899)
@@ -20,17 +20,17 @@
 	private double tscore;
 	private int load;
 	private double delayedDelta;
-	private int jobThrottle;
+	private float jobThrottle;
 
-	public WeightedHost(BoundContact contact, int jobThrottle) {
+	public WeightedHost(BoundContact contact, float jobThrottle) {
 		this(contact, 0.0, jobThrottle);
 	}
 
-	public WeightedHost(BoundContact contact, double score, int jobThrottle) {
+	public WeightedHost(BoundContact contact, double score, float jobThrottle) {
 		this(contact, score, 0, jobThrottle);
 	}
 
-	public WeightedHost(BoundContact contact, double score, int load, int jobThrottle) {
+	public WeightedHost(BoundContact contact, double score, int load, float jobThrottle) {
 		this.host = contact;
 		setScore(score);
 		this.load = load;
@@ -129,7 +129,7 @@
 		return !(load < jobThrottle * tscore + 2);
 	}
 
-	public int getJobThrottle() {
+	public float getJobThrottle() {
 		return jobThrottle;
 	}
 }
\ No newline at end of file

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-02-12 17:36:49 UTC (rev 1898)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/WeightedHostScoreScheduler.java	2008-02-12 17:43:46 UTC (rev 1899)
@@ -10,6 +10,7 @@
 package org.globus.cog.karajan.scheduler;
 
 import java.lang.reflect.Field;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -41,6 +42,7 @@
 	public static final String SCORE_HIGH_CAP = "scoreHighCap";
 	public static final String POLICY = "policy";
 	public static final String JOB_THROTTLE = "jobThrottle";
+	public static final String MAX_SUBMISSION_TIME = "maxSubmissionTime";
 
 	private WeightedHostSet sorted;
 	private int policy;
@@ -50,10 +52,12 @@
 	 */
 	private double connectionRefusedFactor, connectionTimeoutFactor, jobSubmissionTaskLoadFactor,
 			transferTaskLoadFactor, fileOperationTaskLoadFactor, successFactor, failureFactor,
-			scoreHighCap;
+			scoreHighCap, maxSubmissionTime;
 
-	private int jobThrottle;
+	private float jobThrottle;
 
+	private double submissionTimeBias, submissionTimeFactor;
+
 	private boolean change;
 	private TaskConstraints cachedConstraints;
 	private boolean cachedLoadState;
@@ -74,8 +78,24 @@
 		failureFactor = -0.5;
 		scoreHighCap = 100;
 		jobThrottle = 2;
+		maxSubmissionTime = 20;
+		updateInternal();
 	}
 
+	// This isn't very accurate since it varies by provider
+	// and with submission parallelism
+	// What it means is that if submission time is exactly this much
+	// then a success should increase the score by successFactor
+	public final double BASE_SUBMISSION_TIME = 0.5;
+
+	protected void updateInternal() {
+		if (maxSubmissionTime < BASE_SUBMISSION_TIME) {
+			throw new IllegalArgumentException("maxSubmissionTime must be > " + BASE_SUBMISSION_TIME);
+		}
+		submissionTimeFactor = -successFactor / (maxSubmissionTime - BASE_SUBMISSION_TIME);
+		submissionTimeBias = -BASE_SUBMISSION_TIME * submissionTimeFactor;
+	}
+
 	public void setResources(ContactSet grid) {
 		super.setResources(grid);
 		if (grid.getContacts() == null) {
@@ -92,7 +112,7 @@
 		sorted.add(wh);
 	}
 
-	protected synchronized void multiplyScore(WeightedHost wh, double factor) {
+	protected synchronized void factorScore(WeightedHost wh, double factor) {
 		double score = wh.getScore();
 		if (logger.isDebugEnabled()) {
 			logger.debug("multiplyScore(" + wh + ", " + factor + ")");
@@ -105,7 +125,7 @@
 		}
 	}
 
-	protected synchronized void multiplyScoreLater(WeightedHost wh, double factor) {
+	protected synchronized void factorScoreLater(WeightedHost wh, double factor) {
 		wh.setDelayedDelta(wh.getDelayedDelta() + factor);
 	}
 
@@ -186,13 +206,11 @@
 		if (logger.isDebugEnabled()) {
 			logger.debug("Next contact: " + selected);
 		}
-		
+
 		sorted.changeLoad(selected, 1);
 		selected.setDelayedDelta(successFactor);
 		return selected.getHost();
 	}
-	
-	
 
 	public synchronized void releaseContact(Contact contact) {
 		if (logger.isDebugEnabled()) {
@@ -263,7 +281,7 @@
 	private static final String[] myPropertyNames = new String[] { POLICY,
 			FACTOR_CONNECTION_REFUSED, FACTOR_CONNECTION_TIMEOUT, FACTOR_SUBMISSION_TASK_LOAD,
 			FACTOR_TRANSFER_TASK_LOAD, FACTOR_FILEOP_TASK_LOAD, FACTOR_FAILURE, FACTOR_SUCCESS,
-			SCORE_HIGH_CAP, JOB_THROTTLE };
+			SCORE_HIGH_CAP, JOB_THROTTLE, MAX_SUBMISSION_TIME };
 	private static Set propertyNamesSet;
 
 	static {
@@ -298,7 +316,7 @@
 				}
 			}
 			else if (JOB_THROTTLE.equals(name)) {
-				jobThrottle = throttleValue(value);
+				jobThrottle = floatThrottleValue(value);
 			}
 			else {
 				double val = TypeUtil.toDouble(value);
@@ -315,6 +333,7 @@
 					throw new KarajanRuntimeException("Failed to set property '" + name + "'", e);
 				}
 			}
+			updateInternal();
 		}
 		else {
 			super.setProperty(name, value);
@@ -337,6 +356,8 @@
 				return;
 			}
 
+			checkSubmissionTime(code, e.getStatus(), t, contacts);
+
 			if (code == Status.SUBMITTED) {
 				// this isn't reliable
 				// factorSubmission(t, contacts, 1);
@@ -368,6 +389,33 @@
 		}
 	}
 
+	public static final String TASK_ATTR_SUBMISSION_TIME = "scheduler:submissionTime";
+
+	private void checkSubmissionTime(int code, Status s, Task t, Contact[] contacts) {
+		synchronized (t) {
+			if (t.getType() == Task.JOB_SUBMISSION) {
+				if (code == Status.SUBMITTING) {
+					t.setAttribute(TASK_ATTR_SUBMISSION_TIME, s.getTime());
+				}
+				else {
+					Date st = (Date) t.getAttribute(TASK_ATTR_SUBMISSION_TIME);
+					if (st != null) {
+						Date st2 = s.getTime();
+						long submissionTime = st2.getTime() - st.getTime();
+						t.setAttribute(TASK_ATTR_SUBMISSION_TIME, null);
+						double delta = submissionTimeBias + submissionTimeFactor * submissionTime
+								/ 1000;
+						if (logger.isDebugEnabled()) {
+							logger.debug("Submission time for " + t + ": " + submissionTime
+									+ "ms. Score delta: " + delta);
+						}
+						factorMultiple(contacts, delta);
+					}
+				}
+			}
+		}
+	}
+
 	private void factorSubmission(Task t, Contact[] contacts, int exp) {
 		// I wonder where the line between abstraction and obfuscation is...
 		if (t.getType() == Task.JOB_SUBMISSION) {
@@ -398,7 +446,7 @@
 			BoundContact bc = (BoundContact) contacts[i];
 			WeightedHost wh = sorted.findHost(bc);
 			if (wh != null) {
-				multiplyScore(wh, factor);
+				factorScore(wh, factor);
 			}
 		}
 	}
@@ -408,7 +456,7 @@
 			BoundContact bc = (BoundContact) contacts[i];
 			WeightedHost wh = sorted.findHost(bc);
 			if (wh != null) {
-				multiplyScoreLater(wh, factor);
+				factorScoreLater(wh, factor);
 			}
 		}
 	}


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

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

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

Revision: 1898
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1898&view=rev
Author:   hategan
Date:     2008-02-12 09:36:49 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
some logging updates

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java	2008-02-12 17:36:02 UTC (rev 1897)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/HostSubmitQueue.java	2008-02-12 17:36:49 UTC (rev 1898)
@@ -35,7 +35,7 @@
 		if ("ssh".equalsIgnoreCase(provider)) {
 			sq = (SubmitQueue) providerQueues.get(provider.toLowerCase());
 			if (sq == null) {
-				sq = new RateLimiterQueue(initialRate, maxRetries, errorRegexp);
+				sq = new RateLimiterQueue(initialRate, maxRetries, errorRegexp, contact);
 				providerQueues.put(provider, sq);
 			}
 		}

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java	2008-02-12 17:36:02 UTC (rev 1897)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/submitQueue/RateLimiterQueue.java	2008-02-12 17:36:49 UTC (rev 1898)
@@ -12,23 +12,30 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
+import org.apache.log4j.Logger;
 import org.globus.cog.abstraction.impl.common.StatusEvent;
 import org.globus.cog.abstraction.interfaces.Status;
 import org.globus.cog.abstraction.interfaces.StatusListener;
+import org.globus.cog.karajan.util.BoundContact;
 
 public class RateLimiterQueue extends AbstractSubmitQueue implements StatusListener {
+	public static final Logger logger = Logger.getLogger(RateLimiterQueue.class);
+
 	public static final int DEFAULT_MAX_RETRIES = 2;
 
 	private long lastSubmit, delay;
 	private static Timer timer;
 	private String errorRegexp;
 	private int maxRetries = DEFAULT_MAX_RETRIES;
+	private BoundContact contact;
 
-	public RateLimiterQueue(int initialRate, int maxRetries, String errorRegexp) {
+	public RateLimiterQueue(int initialRate, int maxRetries, String errorRegexp,
+			BoundContact contact) {
 		super(initialRate);
 		setRate(initialRate);
 		this.errorRegexp = errorRegexp;
 		this.maxRetries = maxRetries;
+		this.contact = contact;
 	}
 
 	public void setRate(int rate) {
@@ -96,7 +103,9 @@
 			if (getThrottle() > 2) {
 				setRate(getThrottle() - 1);
 			}
-			System.err.println("New rate: " + getThrottle() + " S/s");
+			if (logger.isDebugEnabled()) {
+				logger.debug("New rate for \"" + contact + "\": " + getThrottle() + " S/s");
+			}
 		}
 	}
 }


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

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

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

Revision: 1897
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1897&view=rev
Author:   hategan
Date:     2008-02-12 09:36:02 -0800 (Tue, 12 Feb 2008)

Log Message:
-----------
some temp fixes; this should be removed in the future

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

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/SSHThrottlingFailureHandler.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/SSHThrottlingFailureHandler.java	2008-02-12 17:35:15 UTC (rev 1896)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/scheduler/SSHThrottlingFailureHandler.java	2008-02-12 17:36:02 UTC (rev 1897)
@@ -38,9 +38,11 @@
 		}
 		else {
 			Status status = new StatusImpl();
+			//TODO this will, of course, break now that there's
+			//logic to handle out-of-order status events
 			status.setStatusCode(Status.UNSUBMITTED);
 			t.setStatus(status);
-			s.enqueue(t, null);
+			s.enqueue(t, s.getConstraints(t));
 			return true;
 		}
 	}


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