Changeset 33265

Timestamp:

Feb 14, 2012, 4:30:51 PM (14 years ago)

Author:

rhenders

Message:

now deleting 'purged' batches

File:

• trunk/ippToPsps/jython/cleanup.py (modified) (4 diffs)

trunk/ippToPsps/jython/cleanup.py

@@ -29 +29 @@
     logger.infoTitle("Cleaning up batch type %s" % batchType)
 
-    localIDs = ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType, config.epoch, config.dvoLabel)
-    datastoreIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType, config.epoch, config.dvoLabel)
-    dxlayerIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType, config.epoch, config.dvoLabel)
-    logger.infoPair("Merged but still on local disk", "%d" % len(localIDs))
-    logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(datastoreIDs))
-    logger.infoPair("Loaded to ODM but still in DXLayer", "%d" % len(dxlayerIDs))
+    loadedDatastoreIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType, config.epoch, config.dvoLabel)
+    loadedDxlayerIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType, config.epoch, config.dvoLabel)
+    mergedLocalIDs = ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType, config.epoch, config.dvoLabel)
+
+    purgedDatastoreIDs = ippToPspsDb.getPurgedButNotDeletedFromDatastore(batchType, config.epoch, config.dvoLabel)
+    purgedLocalIDs = ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType, config.epoch, config.dvoLabel)
+
+    logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(loadedDatastoreIDs))
+    logger.infoPair("Loaded to ODM but still in DXLayer", "%d" % len(loadedDxlayerIDs))
+    logger.infoPair("Merged but still on local disk", "%d" % len(mergedLocalIDs))
+    logger.infoPair("Purged but still on datastore", "%d" % len(purgedDatastoreIDs))
+    logger.infoPair("Purged but still on local disk", "%d" % len(purgedLocalIDs))
 
     if config.deleteLocal:
+        logger.infoSeparator()
         count = 0
-        for id in localIDs:
+        ids = mergedLocalIDs + purgedLocalIDs
+        for id in ids:
     
             if Batch.deleteFromDisk(logger, config.basePath, batchType, config.dvoLabel, id):
@@ -44 +52 @@
                 count = count + 1
 
+        logger.infoSeparator()
         logger.infoPair("Removed from local disk", "%d" % count)
-        logger.infoPair("Remaining on local disk", "%d" % (len(localIDs) - count))
+        logger.infoPair("Remaining on local disk", "%d" % (len(ids) - count))
     
 
     if config.deleteDatastore:
+        logger.infoSeparator()
         count = 0
-        for id in datastoreIDs:
+        ids = loadedDatastoreIDs + purgedDatastoreIDs
+        for id in ids:
     
             batchName = Batch.getNameFromID(id)
@@ -57 +68 @@
                 count = count + 1
 
+        logger.infoSeparator()
         logger.infoPair("Removed from datastore", "%d" % count)
-        logger.infoPair("Remaining on datastore", "%d" % (len(datastoreIDs) - count))
+        logger.infoPair("Remaining on datastore", "%d" % (len(ids) - count))
     
     if config.deleteDxLayer:
+        logger.infoSeparator()
         count = 0
-        for id in dxlayerIDs:
+        for id in loadedDxlayerIDs:
     
             if dxlayer.deleteBatch(id):
@@ -68 +81 @@
                 count = count + 1
 
+        logger.infoSeparator()
         logger.infoPair("Removed from DXLayer", "%d" % count)
-        logger.infoPair("Remaining on DXLayer", "%d" % (len(dxlayerIDs) - count))
+        logger.infoPair("Remaining on DXLayer", "%d" % (len(loadedDxlayerIDs) - count))