Changeset 535

Timestamp:

Oct 10, 2006 6:25:19 AM (18 years ago)

Author:

dkearney

Message:

added tools and queue to init script for
python rappture, updated python rappture's
queue module to look for an environment
variable for setting the queue name

Location:

trunk/python/Rappture

Files:

• __init__.py (modified) (1 diff)
• queue.py (modified) (2 diffs)

trunk/python/Rappture/__init__.py

@@ -4 +4 @@
 from number import number
 from result import result
+import queue as queue
+import tools as tools

trunk/python/Rappture/queue.py

@@ -216 +216 @@
         self.executable(executable)
         self.execArgs(execArgs)
-        self.queue("@vma118.punch.purdue.edu")
+        nanoHUBQ = os.getenv("NANOHUB_PBS_QUEUE")
+        if nanoHUBQ is None :
+            self.queue("@vma118.punch.purdue.edu")
+        else:
+            self.queue(nanoHUBQ)
 
     def __initPbsScriptVars__(self):
@@ -317 +321 @@
         retVal = self._pbs_msgs['DEFAULT']
         if self._jobId:
-            cmdOutput = getCommandOutput("qstat -a | grep \'^ *%s\'" % (self._jobId))
+            nanoHUBQ = self.queue()
+            if nanoHUBQ != "":
+                atLocation = nanoHUBQ.find('@')
+                if atLocation > -1:
+                    pbsServer = nanoHUBQ[atLocation+1:]
+
+            if pbsServer == '':
+                cmd = "qstat -a | grep \'^ *%s\'" % (self._jobId)
+            else:
+                cmd = "qstat @%s -a | grep \'^ *%s\'" % (pbsServer,self._jobId)
+            cmdOutput = getCommandOutput(cmd)
+
             # parse a string that should look like this: 
             # 32049.hamlet.rc kearneyd ncn      run.21557.   6104   8   8    --  24:00 R 00:00