Changeset 3579

Timestamp:

10/26/2009 02:01:23 PM (1 month ago)

Author:

brian

Message:

Fixed bootstrapping of new PBS/SGE batch systems.

Files:

• gip/trunk/gip/lib/python/gip/batch_systems/batch_system.py (modified) (1 diff)
• gip/trunk/gip/lib/python/gip/batch_systems/pbs.py (modified) (2 diffs)
• gip/trunk/gip/lib/python/gip/batch_systems/sge.py (modified) (1 diff)
• gip/trunk/gip/lib/python/gip/providers/generic_batch_system.py (modified) (1 diff)

gip/trunk/gip/lib/python/gip/batch_systems/batch_system.py

@@ -107 +107 @@
-        """
-
+    def bootstrap(self):
+        """
+        This function is called before any others; this is the proper time to
+        do any environment or batch system initialization.
+        """
+

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

@@ -9 +9 @@
-import gip_sets as sets
-
-
+
+
-from gip_testing import runCommand
-from gip.batch_systems.batch_system import BatchSystem
@@ -418 +419 @@
-        return vos
-
+    def bootstrap(self):
+        try:
+            pbs_path = cp_get(self.cp, "pbs", "pbs_path", ".")
+            addToPath(pbs_path)
+            # adding pbs_path/bin to the path as well, since pbs/torque home 
+            # points to /usr/local and the binaries exist in /usr/local/bin
+            addToPath(pbs_path + "/bin")
+        except Exception, e:
+            log.exception(e)
+
+

gip/trunk/gip/lib/python/gip/batch_systems/sge.py

@@ -430 +430 @@
-        return results
-
+    def bootstrap(self):
+        """
+        If it exists, source
+        $SGE_ROOT/$SGE_CELL/common/settings.sh
+        """
+        sge_root = cp_get(cp, "sge", "sge_root", "")
+        if not sge_root:
+            log.warning("Could not locate sge_root in config file!  Not " \
+                "bootstrapping SGE environment.")
+            return
+        sge_cell = cp_get(cp, "sge", "sge_cell", "")
+        if not sge_cell:
+            log.warning("Could not locate sge_cell in config file!  Not " \
+                "bootstrapping SGE environment.")
+            return
+        settings = os.path.join(sge_root, sge_cell, "common/settings.sh")
+        if not os.path.exists(settings):
+            log.warning("Could not find the SGE settings file; looked in %s" % \
+                settings)
+            return
+        cmd = "/bin/sh -c 'source %s; /usr/bin/env'" % settings
+        fd = os.popen(cmd)
+        results = fd.read()
+        if fd.close():
+            log.warning("Unable to source the SGE settings file; tried %s." % \
+                settings)
+        for line in results.splitlines():
+            line = line.strip()
+            info = line.split('=', 2)
+            if len(info) != 2:
+                continue
+            os.environ[info[0]] = info[1]
+

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

@@ -191 +191 @@
-            log.error("Unknown job manager: %s" % impl)
-            sys.exit(1)
+        batch.bootstrap()
-        queueInfo, totalCpu, freeCpu, queueCpus = print_CE(batch)
-        print_VOViewLocal(queueInfo, batch)