Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/odm.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/odm.py (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/odm.py

@@ -2 +2 @@
 
 import re
+import os
+import signal
 import sys
 import tempfile
@@ -33 +35 @@
         p = Popen("../perl/checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, 
                 shell=True, 
-                stdout=PIPE)
+                stdout=PIPE,
+                close_fds=True)
         p.wait()
-        
+       
         if p.returncode != 0:
            self.logger.debugPair("ODM polling", "failed")
@@ -45 +48 @@
 
         tempFile.close()
+        p.stdout.close()
+
 
         if not ret: self.logger.debugPair("Cannot read ODM file for batch", "%d" % batchID)
@@ -58 +63 @@
 
         loadedToODM = 0
-        loadFailed = 0
         mergeWorthy = 0
         merged = 0
@@ -66 +70 @@
             STATE = doc.find("{%s}OdmBatchState/{%s}BatchState" % (NAMESPACE, NAMESPACE)).text
             MESSAGE = doc.find("{%s}OdmBatchState/{%s}Message" % (NAMESPACE, NAMESPACE)).text
+            results['MESSAGE'] = MESSAGE
+            results['DETAILS'] = "None"
 
-            if re.search("failed", STATE): loadFailed = 1
-            if re.search("MergeWorthy", MESSAGE): mergeWorthy = 1
-            if re.search("Merge[1-9]Completed", MESSAGE): merged = 1
-            if mergeWorthy or merged or loadFailed: loadedToODM = 1
+            # we assume that batches 'OnHold' are failed as it is very rare for such
+            # batches to have there state changed
+            if re.search("failed", STATE) or re.search("OnHold", MESSAGE):
+                loadedToODM = -1
+                DETAILS = doc.find("{%s}OdmBatchState/{%s}Details" % (NAMESPACE, NAMESPACE)).text
+                results['DETAILS'] = DETAILS
+            if re.search("processing", STATE): 
+                loadedToODM = 1
+            if re.search("MergeWorthy", MESSAGE): 
+                loadedToODM = 1
+                mergeWorthy = 1
+            if re.search("Merge[1-9]Completed", MESSAGE): 
+                loadedToODM = 1
+                mergeWorthy = 1
+                merged = 1
         except:
-            return 0
+            pass
 
         results['LOADEDTOODM'] = loadedToODM
-        results['LOADFAILED'] = loadFailed
         results['MERGEWORTHY'] = mergeWorthy
         results['MERGED'] = merged