[Swift-commit] r2199 - in trunk: libexec src/org/griphyn/vdl/karajan/lib

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-08-26 15:24:19 -0500 (Tue, 26 Aug 2008)
New Revision: 2199

Modified:
   trunk/libexec/vdl-int.k
   trunk/src/org/griphyn/vdl/karajan/lib/Execute.java
Log:
jobid to karajan task ID binding

Modified: trunk/libexec/vdl-int.k
===================================================================
--- trunk/libexec/vdl-int.k	2008-08-26 17:20:45 UTC (rev 2198)
+++ trunk/libexec/vdl-int.k	2008-08-26 20:24:19 UTC (rev 2199)
@@ -410,6 +410,7 @@
 							vdl:tcprofile(tr, rhost) //this gets various app params from the tc, such as environment, walltime, etc
 							replicationGroup=replicationGroup
 							replicationChannel=replicationChannel
+							jobid=jobid
 						)
 							
 						checkJobStatus(rhost, wfdir, jobid, tr, jobdir)

Modified: trunk/src/org/griphyn/vdl/karajan/lib/Execute.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/Execute.java	2008-08-26 17:20:45 UTC (rev 2198)
+++ trunk/src/org/griphyn/vdl/karajan/lib/Execute.java	2008-08-26 20:24:19 UTC (rev 2199)
@@ -25,6 +25,7 @@
 
 	public static final Arg A_REPLICATION_GROUP = new Arg.Optional("replicationGroup");
 	public static final Arg A_REPLICATION_CHANNEL = new Arg.Optional("replicationChannel");
+	public static final Arg A_JOBID = new Arg.Optional("jobid");
 
 	static {
 		setArguments(Execute.class, new Arg[] { A_EXECUTABLE, A_ARGS, A_ARGUMENTS, A_HOST,
@@ -33,7 +34,7 @@
 				A_ENVIRONMENT, A_QUEUE, A_PROJECT, A_MINMEMORY, A_MAXMEMORY, A_REDIRECT,
 				A_SECURITY_CONTEXT, A_DIRECTORY, A_NATIVESPEC, A_DELEGATION, A_ATTRIBUTES,
 				C_ENVIRONMENT, A_FAIL_ON_JOB_ERROR, A_BATCH, A_REPLICATION_GROUP,
-				A_REPLICATION_CHANNEL });
+				A_REPLICATION_CHANNEL, A_JOBID });
 	}
 
 	public Execute() {
@@ -47,6 +48,8 @@
 				logger.debug(task);
 				logger.debug("Submitting task " + task);
 			}
+			String jobid = (String)A_JOBID.getValue(stack,null);
+			logger.info("jobid="+jobid+" task=" + task);
 			scheduler.addJobStatusListener(this, task);
 			synchronized (tasks) {
 				tasks.put(task, stack);