[Swift-commit] cog r3510

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3510 | davidkelly999 | 2012-11-14 21:04:52 -0600 (Wed, 14 Nov 2012) | 3 lines

By default, condor will allocate 1gb of memory per job. For jobs with larger memory requirements, the request_memory parameter must be defined. This can now be set in sites.xml.
Also provide a mechanism similar to what exists for pbs for defining arbitrary provider parameters such as accounting groups, etc.

------------------------------------------------------------------------
Index: modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/condor/CondorExecutor.java
===================================================================
--- modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/condor/CondorExecutor.java	(revision 3509)
+++ modules/provider-localscheduler/src/org/globus/cog/abstraction/impl/scheduler/condor/CondorExecutor.java	(working copy)
@@ -45,6 +45,7 @@
 		boolean grid = false;
 		Task task = getTask();
 		JobSpecification spec = getSpec();
+		getSpec().unpackProviderAttributes();
 		String type = (String) spec.getAttribute("jobType");
 		if (logger.isDebugEnabled()) {
 			logger.debug("Job type: " + type);
@@ -110,6 +111,19 @@
 			}
 		}
 		wr.write('\n');
+
+		String request_memory = (String) spec.getAttribute("request_memory");
+		if(request_memory != null) {
+			wr.write("request_memory = " + request_memory + '\n');
+		}
+		
+		String resources = (String) spec.getAttribute("condor.resource_list");
+		if (resources != null && resources.length() > 0) {
+			if (logger.isDebugEnabled())
+				logger.debug("condor.resource_list: " + resources);
+			wr.write(resources + '\n');
+		}
+		
 		wr.write("notification = Never\n");
 		wr.write("leave_in_queue = TRUE\n");
 		wr.write("queue\n");
@@ -220,7 +234,7 @@
 				}
 			}
 			else {
-				logger.warn("Failed makr job " + jobid
+				logger.warn("Failed to mark job " + jobid
 						+ " as removable from queue: "
 						+ getOutput(p.getInputStream()));
 			}