[Swift-commit] r6245 - branches/faster/libexec

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-02-08 22:38:08 -0600 (Fri, 08 Feb 2013)
New Revision: 6245

Modified:
   branches/faster/libexec/swift-int.k
   branches/faster/libexec/swift.k
Log:
fixed various issues

Modified: branches/faster/libexec/swift-int.k
===================================================================
--- branches/faster/libexec/swift-int.k	2013-02-09 04:37:54 UTC (rev 6244)
+++ branches/faster/libexec/swift-int.k	2013-02-09 04:38:08 UTC (rev 6245)
@@ -284,7 +284,7 @@
 				dir:make(ldir, host=dhost, provider=provider)
 				policy := cdm:query(query=file)
 				log(LOG:DEBUG, "CDM: {file} : {policy}")
-				if (policy == "DEFAULT" | policy == "BROADCAST") {
+				if ((policy == "DEFAULT") | (policy == "BROADCAST")) {
 					restartOnError(2) {
 						task:transfer(srchost=host, srcfile=bname,srcdir=rdir,
 							destdir=ldir, desthost=dhost, destprovider=provider,
@@ -367,13 +367,10 @@
 			replicationGroup, replicationChannel
 			arguments = [], stdin = null, stdout = null, stderr = null, attributes = null) {
 			
-			log(LOG:INFO, "A ", currentThread())
 			stagein := list(unique(each(stagein)))
 			stageout := list(unique(each(stageout)))
-			log(LOG:INFO, "X ", currentThread())
 
 			allocateHost(rhost, constraints = jobConstraints(tr, stagein = stagein)) {
-				log(LOG:INFO, "B ", currentThread())
 				ddir := initDDir(),
 				(wfdir, sharedDir) := 
 					try {
@@ -383,7 +380,6 @@
 						throw(exception("Could not initialize shared directory on {rhost}", exception))
 					}
 					
-				log(LOG:INFO, "C ", currentThread())
 				uid := UID()
 				jobdir := substring(uid, from=0, to=1)
 				jobid := "{tr}-{uid}"
@@ -419,7 +415,6 @@
 					}
 				}
 
-				log(LOG:INFO, "D ", currentThread())
 				setProgress(progress, "Stage in")
 				tmpdir := dircat("{wfdir}/jobs/{jobdir}", jobid)
 
@@ -523,7 +518,7 @@
 					}
 					else {
 						setProgress(progress, "Failed but can retry")
-						exception := try(exception(checkErrorFile(rhost, wfdir, jobid, jobdir)), prev)
+						exception := try(exception(checkErrorFile(rhost, wfdir, jobid, jobdir), prev), prev)
 						
 						log(LOG:DEBUG, "APPLICATION_EXCEPTION jobid={jobid} - Application exception: ", exception)
 

Modified: branches/faster/libexec/swift.k
===================================================================
--- branches/faster/libexec/swift.k	2013-02-09 04:37:54 UTC (rev 6244)
+++ branches/faster/libexec/swift.k	2013-02-09 04:38:08 UTC (rev 6245)
@@ -78,6 +78,7 @@
 	
 	export(stdin,
 		function(file) {
+			echo(file)
 			stdin = file
 		}
 	)
@@ -206,8 +207,8 @@
 									try {
 										execute2(
 											progress, 
-											tr, maybe(arguments=unwrapClosedList(arguments)),
-											maybe(stdin=stdin), maybe(stdout=stdout), maybe(stderr=stderr), maybe(attributes=attributes),
+											tr, if(arguments != null, arguments = unwrapClosedList(arguments)),
+											stdin=stdin, stdout=stdout, stderr=stderr, attributes=attributes,
 											stagein, stageout, restartout, replicationGroup, replicationChannel
 										)
 									}