Changeset 2784

Timestamp:

01/29/2009 01:09:36 PM (10 months ago)

Author:

brian

Message:

Fix for ticket #25 plus test case.

Files:

• gip/trunk/gip/lib/python/gip/providers/pbs.py (modified) (1 diff)
• gip/trunk/test/command_output/qstat_Q_f (modified) (1 diff)
• gip/trunk/test/pbs_test.py (modified) (1 diff)

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

@@ -72 +72 @@
-        if 'max_queuable' in info:
-            info['max_total'] = info['max_queuable']
+            info['free_slots'] = min(info['free_slots'], info['max_queuable'])
-        else:
-            info['max_total'] = info['max_waiting'] + info['max_running']

gip/trunk/test/command_output/qstat_Q_f

@@ -161 +161 @@
-    queue_type = Execution
-    Priority = 135
-2000
+183
-    total_jobs = 0
-    state_count = Transit:0 Queued:0 Held:0 Waiting:0 Running:0 Exiting:0 Begun

gip/trunk/test/pbs_test.py

@@ -137 +137 @@
-                    entry.glue['CEUniqueID'] == 'red.unl.edu:2119/jobmanager' \
-                    '-pbs-lcgadmin':
-
-
+
-                has_lcgadmin_ce = True
-        self.failUnless(has_default_ce, msg="Default queue's CE was not found!")
-        self.failUnless(has_default_ce, msg="lcgadmin queue's CE was not found!")
+
+    def test_max_queuable_26(self):
+        """
+        Regression test for max_queuable.  Ensure that the number of free slots
+        reported is never greater than the # of max queuable
+        """
+        os.environ['GIP_TESTING'] = '1'
+        path = os.path.expandvars("$GIP_LOCATION/libexec/" \
+            "osg-info-provider-pbs.py --config=test_configs/red.conf")
+        fd = os.popen(path)
+        entries = read_ldap(fd)
+        self.failUnless(fd.close() == None)
+        has_lcgadmin_ce = False
+        for entry in entries:
+            if 'GlueCE' in entry.objectClass and \
+                    entry.glue['CEUniqueID'] == 'red.unl.edu:2119/jobmanager' \
+                    '-pbs-lcgadmin':
+                self.failUnless(entry.glue['CEPolicyMaxWaitingJobs'] == '183')
+                self.failUnless(entry.glue['CEStateFreeCPUs'] == '183')
+                self.failUnless(entry.glue['CEStateFreeJobSlots'] == '183')
+                has_lcgadmin_ce = True
+        self.failUnless(has_lcgadmin_ce, msg="lcgadmin queue's CE was not found!")
+
-
-    def make_site_tester(site):