Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/loader.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/loader.py (modified) (6 diffs)

branches/eam_branches/ipp-20120405/ippToPsps/jython/loader.py

@@ -45 +45 @@
                 self.scratchDb.disconnect()
                 continue
-            self.logger.infoPair("Using scratch Db", self.scratchDb.dbName)
             break
 
-        if not self.scratchDb.connected: 
-            self.logger.errorPair("Cannot connect to a", "scratch database")
+        if not self.scratchDb.connected:
+            self.exitProgram("Cannot connect to a scratch database")
+            raise
        
         # create Datastore objects
@@ -108 +108 @@
     '''
     def run(self):
+
+        if not self.scratchDb.connected: return
 
         numAttempts = 0
@@ -152 +154 @@
                     if batchType != "OB":
                         # look in DVO for this box (with extra border)
-                        #self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
-                        self.dvoDetections.setSkyArea()
+                        self.logger.infoPair("Querying DVO for this sky area", "")
+                        self.dvoDetections.setSkyAreaAsBox(boxDim['RA'], boxDim['DEC'], boxSizeWithBorder)
+                        #self.dvoDetections.setSkyArea()
                         sizeToBeIngested = self.dvoDetections.getDiskSizeOfRegionsToBeIngested()
                         if sizeToBeIngested == 0.0: smfsPerGB = 999999999
@@ -160 +163 @@
                         self.logger.infoPair("smfs-per-GB", "%.1f" % smfsPerGB)
                         # should do we pre-ingest stuff from DVO?
-                        if smfsPerGB > 30:
+                        if batchType == 'P2' and smfsPerGB > 30:
                             if not self.dvoDetections.sync():
                                 self.logger.errorPair("Could not sync DVO with MySQL", "skipping")
@@ -195 +198 @@
     
             self.ippToPspsDb.unlockTables()
+            self.ippToPspsDb.deletePendingItem(batchType, id)
+
+            # catch any raised exceptions in batch constructors
+            try:
+                if batchType == "P2":
+                    batch = DetectionBatch(self.logger,
+                            self.config,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+                elif batchType == "ST":
+                    batch = StackBatch(self.logger,
+                            self.config,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+    
+                elif batchType == "OB":
+                    batch = ObjectBatch(self.logger,
+                            self.config,
+                            self.gpc1Db,
+                            self.ippToPspsDb,
+                            self.scratchDb,
+                            id,
+                            batchID,
+                            useFullTables)
+    
+                batch.run()
    
-            self.ippToPspsDb.deletePendingItem(batchType, id)
-
-            if batchType == "P2":
-                batch = DetectionBatch(self.logger,
-                        self.config,
-                        self.gpc1Db,
-                        self.ippToPspsDb,
-                        self.scratchDb,
-                        id,
-                        batchID,
-                        useFullTables)
-            elif batchType == "ST":
-                batch = StackBatch(self.logger,
-                        self.config,
-                        self.gpc1Db,
-                        self.ippToPspsDb,
-                        self.scratchDb,
-                        id,
-                        batchID,
-                        useFullTables)
-    
-            elif batchType == "OB":
-                batch = ObjectBatch(self.logger,
-                        self.config,
-                        self.gpc1Db,
-                        self.ippToPspsDb,
-                        self.scratchDb,
-                        id,
-                        batchID,
-                        useFullTables)
-    
-            batch.run()
-    
+            # if batch fails, ignore and move on to the next one
+            except: 
+                self.logger.errorPair("Problem with this %s batch (%d)" % (batchType, id), "skipping")
+                pass
+
             if not self.checkClientStatus(): return False
     
@@ -253 +262 @@
     loader = Loader(sys.argv)
     loader.run()
-    loader.exitProgram("finished")
+    loader.exitProgram("completed")
 except Exception, e:
     print str(e)
     traceback.print_exc()
+