Changeset 3585

Timestamp:

10/30/2009 08:32:00 AM (3 weeks ago)

Author:

brian

Message:

Enforce free slots constraint in the providers for VOView.

Files:

• gip/trunk/gip/lib/python/gip/providers/condor.py (modified) (2 diffs)
• gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py (modified) (2 diffs)
• gip/trunk/gip/lib/python/gip/providers/lsf.py (modified) (2 diffs)
• gip/trunk/gip/lib/python/gip/providers/pbs.py (modified) (2 diffs)

gip/trunk/gip/lib/python/gip/providers/condor.py

@@ -372 +372 @@
-            free = min(unclaimed, assigned-myrunning,
-                assigned-int(info['running']))
+            free = int(free)
+
+            waiting = int(info["idle"]) + int(info["held"])
+            if waiting > 0:
+                free_slots = 0
-
-            info = {"vo"      : vo,
@@ -383 +388 @@
-                # Held jobs are included as "waiting" since the definition is:
-                #    Number of jobs that are in a state different than running
-info["idle"] + info["held"]
+waiting
-                "total"       : info["running"] + info["idle"] + info["held"],
-int(free)
+free
-                "job_slots"   : int(total_nodes),
-                "ert"         : ert,

gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py

@@ -157 +157 @@
-        max_running = min(max_running, my_queue_info.get('max_running', 99999))
-
+        waiting = info2.get("wait", 0)
+        free_slots = my_queue_info.get('free_slots', 0)
+        if waiting > 0:
+            free_slots = 0
+
-        info = {
-            'ceUniqueID'  : ce_unique_id,
-            'job_slots'   : my_queue_info.get('job_slots', 0),
-my_queue_info.get('free_slots', 0)
+free_slots
-            'ce_name'     : ce_name,
-            'queue'       : queue,
@@ -169 +174 @@
-            'max_running' : max_running,
-            'priority'    : queue_info.get(queue, {}).get('priority', 0),
-info2.get('wait', 0)
+waiting
-            'data'        : cp_get(cp, "osg_dirs", "data", "UNKNOWN_DATA"),
-            'app'         : cp_get(cp, "osg_dirs", "app", "UNKNOWN_APP"),

gip/trunk/gip/lib/python/gip/providers/lsf.py

@@ -146 +146 @@
-            max_job_time=my_queue_info.get("max_wall", 0))
-
+        free_slots = my_queue_info.get('free_slots', 0)
+        waiting = info2.get('waiting', 0)
+        if waiting > 0:
+            free_slots = 0
+
-        info = {
-            'ceUniqueID'  : ce_unique_id,
-            'job_slots'   : my_queue_info.get('job_slots', 0),
-my_queue_info.get('free_slots', 0)
+free_slots
-            'ce_name'     : ce_name,
-            'queue'       : queue,
@@ -158 +163 @@
-            'max_running' : info2.get('max_running', 0),
-            'priority'    : queue_info.get(queue, {}).get('priority', 0),
-info2.get('waiting', 0)
+waiting
-            'data'        : cp_get(cp, 'osg_dirs', 'data', "/UNKNOWN_DATA"),
-            'app'         : cp_get(cp, 'osg_dirs', 'app', "/UNKNOWN_APP"),

gip/trunk/gip/lib/python/gip/providers/pbs.py

@@ -130 +130 @@
-            max_job_time=my_queue_info.get("max_wall", 0))
-
+        free_slots = my_queue_info.get('free_slots', 0)
+        waiting = info2.get('wait', 0)
+        if waiting > 0:
+            free_slots = 0
+
-        info = {
-            'ceUniqueID'  : ce_unique_id,
-            'job_slots'   : my_queue_info.get('job_slots', 0),
-my_queue_info.get('free_slots', 0)
+free_slots
-            'ce_name'     : ce_name,
-            'queue'       : queue,
@@ -142 +147 @@
-            'max_running' : info2.get('max_running', 0),
-            'priority'    : queue_info.get(queue, {}).get('priority', 0),
-info2.get('wait', 0)
+waiting
-            'data'        : cp_get(cp, "osg_dirs", "data", "UNKNOWN_DATA"),
-            'app'         : cp_get(cp, "osg_dirs", "app", "UNKNOWN_APP"),