Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/cleanup.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippToPsps/jython/cleanup.py (modified) (7 diffs)

branches/eam_branches/ipp-20110906/ippToPsps/jython/cleanup.py

@@ -6 +6 @@
 import re
 import sys
-
+import time
 import logging.config
 
@@ -13 +13 @@
 from batch import Batch
 from datastore import Datastore
+from dxlayer import DXLayer
 
 '''
@@ -27 +28 @@
     logger.infoTitle("Cleaning up batch type %s" % batchType)
 
-    localIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromLocalDisk(batchType, EPOCH, DVOLABEL)
+    localIDs = ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType, EPOCH, DVOLABEL)
     datastoreIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType, EPOCH, DVOLABEL)
     dxlayerIDs = ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType, EPOCH, DVOLABEL)
-    logger.infoPair("Loaded to ODM but still on local disk", "%d" % len(localIDs))
+    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))
@@ -53 +54 @@
 
             if datastore.remove(batchName):
-                ippToPspsDb.updateDeletedDatastore(id, 1)
                 count = count + 1
 
         logger.infoPair("Removed from datastore", "%d" % count)
         logger.infoPair("Remaining on datastore", "%d" % (len(datastoreIDs) - count))
+    
+    if DELETEDXLAYER:
+        count = 0
+        for id in dxlayerIDs:
+    
+            if dxlayer.deleteBatch(id):
+                ippToPspsDb.updateDeletedDxlayer(id, 1)
+                count = count + 1
+
+        logger.infoPair("Removed from DXLayer", "%d" % count)
+        logger.infoPair("Remaining on DXLayer", "%d" % (len(dxlayerIDs) - count))
     
 
@@ -66 +77 @@
 if len(sys.argv) > 1: CONFIG  = sys.argv[1]
 else:
-    print "\n** Usage: " + sys.argv[0] + " <configPath>\n"
+    print "\n** Usage: " + sys.argv[0] + " <configPath> [hours]\n"
     sys.exit(1)
+
+if len(sys.argv) > 2: 
+    HOURS = float(sys.argv[2])
+    SECONDS = HOURS * 60.0 * 60.0
+else: 
+    SECONDS = None
 
 # open config file
@@ -78 +95 @@
 
 ippToPspsDb = IppToPspsDb(logger, configDoc)
-datastore = Datastore(logger, configDoc)
+datastore = Datastore(logger, configDoc, ippToPspsDb)
+dxlayer = DXLayer(logger)
 
 DVOLABEL = configDoc.find("dvo/gpc1Label").text
@@ -88 +106 @@
 
 logger.infoTitle("ippToPsps clean-up")
+if SECONDS: logger.infoPair("Performing clean-up every", "%f hours" % (SECONDS/60.0/60.0))
 logger.infoBool("Deleting from local disk?", DELETELOCAL)
 logger.infoBool("Deleting from datastore?", DELETEDATASTORE)
 logger.infoBool("Deleting from DXLayer?", DELETEDXLAYER)
 
-clean("P2")
-clean("ST")
+while True:
+
+    clean("P2")
+    clean("ST")
+
+    if SECONDS:
+        logger.infoPair("Waiting for", "%f hours" % HOURS)
+        time.sleep(SECONDS)
+    else: break
+