Changeset 32852 for branches/eam_branches/ipp-20111122/ippToPsps/jython/batch.py

Timestamp:

Dec 2, 2011, 11:45:13 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/jython/batch.py (modified) (7 diffs)

branches/eam_branches/ipp-20111122/ippToPsps/jython/batch.py

@@ -286 +286 @@
     Publishes this batch to the datastore
     '''
-    def tarZipAndpublishToDatastore(self):
+    def tarAndZip(self):
       
         # set up filenams and paths
@@ -295 +295 @@
 
         # tar directory
-        p = Popen("tar -cvf " + tarPath + "\
-                -C " + self.subDir + " \
-                " + self.batchName, shell=True, stdout=PIPE)
+        cmd = "tar -cvf " + tarPath + " -C " + self.subDir + " " + self.batchName
+        self.logger.infoPair("Creating tar archive", cmd)
+        p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
 
+        if p.returncode != 0:
+            self.logger.errorPair("tar command", "failed")
+            return False
+
         # zip tar archive
-        p = Popen("gzip -c " + tarPath + " > " + tarballPath, shell=True, stdout=PIPE)
+        cmd = "gzip -c " + tarPath + " > " + tarballPath
+        self.logger.infoPair("Compressing tar archive", cmd)
+        p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
+
+        if p.returncode != 0:
+            self.logger.errorPair("gzip command", "failed")
+            return False
+
+        # only now can we report that the batch has successfully processed
+        self.ippToPspsDb.updateProcessed(self.batchID, 1)
 
         # delete tar file and original directory
@@ -308 +321 @@
         shutil.rmtree(self.localOutPath)
 
-        # now publish to the datastore
-        Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
+        return True
 
     '''
@@ -448 +460 @@
         try:
             stilts.twrites(_tables, self.outputFitsPath, fmt='fits')
-            self.ippToPspsDb.updateProcessed(self.batchID, 1)
         except:
             self.logger.exception("Could not write to FITS")
@@ -494 +505 @@
         p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
-        #        out = p.stdout.read()
 
         rowCount = self.scratchDb.getRowCount("dvoDetection")
@@ -507 +517 @@
     '''
     Creates and publishes a batch
-    TODO all methdds call below should throw exceptions on failure
+    TODO all methods call below should throw exceptions on failure
     '''
     def run(self):
@@ -530 +540 @@
             else:
                 self.writeBatchManifest()
-                if int(self.doc.find("options/publishToDatastore").text): self.tarZipAndpublishToDatastore()
+                if int(self.doc.find("options/publishToDatastore").text): 
+                    # tar and zip ready for publication to datastore
+                    if self.tarAndZip():
+                        # now publish to the datastore
+                        tarballFile = Batch.getTarballFile(self.batchID)
+                        Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
+
                 if int(self.doc.find("options/reportNulls").text): self.reportNullsInAllPspsTables(False)