|
From: <b_...@us...> - 2008-07-30 16:26:37
|
Revision: 2123
http://cogkit.svn.sourceforge.net/cogkit/?rev=2123&view=rev
Author: b_z_c
Date: 2008-07-30 16:26:30 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
filter coaster attributes before submitting jobs
Modified Paths:
--------------
trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-07-30 01:33:51 UTC (rev 2122)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/job/manager/WorkerManager.java 2008-07-30 16:26:30 UTC (rev 2123)
@@ -15,11 +15,13 @@
import java.io.InputStream;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
@@ -60,6 +62,10 @@
public static final int MAX_WORKERS = 256;
public static final int MAX_STARTING_WORKERS = 32;
+ public static final List coasterAttributes = Arrays.asList(new String[]{
+ "coastersPerNode"
+ });
+
private SortedMap ready;
private Map ids;
private Set busy;
@@ -232,7 +238,9 @@
Iterator i = pspec.getAttributeNames().iterator();
while (i.hasNext()) {
String name = (String) i.next();
- tspec.setAttribute(name, pspec.getAttribute(name));
+ if(!coasterAttributes.contains(name)) {
+ tspec.setAttribute(name, pspec.getAttribute(name));
+ }
}
tspec.setAttribute("maxwalltime", new WallTime(maxWallTime)
.getSpecInMinutes());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|