IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 29, 2012, 5:07:20 PM (14 years ago)
Author:
eugene
Message:

merging changes from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120405/ippToPsps/jython/cleanup.py

    r33708 r33948  
    77import sys
    88import time
     9import traceback
    910import logging.config
    1011
    … …  
    4142            self.logger.infoPair("Config", self.config.name)
    4243            self.config.printDeletionPolicy()
     44            self.clean("IN")
    4345            self.clean("P2")
    4446            self.clean("ST")
    … …  
    4850            if not self.waitForPollTime(): break
    4951   
     52    '''
     53    Reports results of cleanup for this set of IDs
     54    '''
     55    def reportResults(self, name, ids, success):
     56
     57        if len(ids) > 0:
     58            self.logger.infoSeparator()
     59            self.logger.infoPair("Removed from " + name, "%d of %d" % (success, len(ids)))
     60   
     61
    5062    '''
    5163    Finds stuff to delete for this batch type, then:
    … …  
    6274
    6375        loadedDatastoreIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDatastore(batchType)
    64         loadedDxlayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
     76        deleteFromDxLayerIDs = self.ippToPspsDb.getLoadedToODMButNotDeletedFromDXLayer(batchType)
    6577        mergedLocalIDs = self.ippToPspsDb.getMergedButNotDeletedFromLocalDisk(batchType)
    6678
    … …  
    6880        purgedLocalIDs = self.ippToPspsDb.getPurgedButNotDeletedFromLocalDisk(batchType)
    6981
    70         self.logger.infoPair("Loaded to ODM but still on datastore", "%d" % len(loadedDatastoreIDs))
    71         self.logger.infoPair("Loaded to ODM but still in DXLayer", "%d" % len(loadedDxlayerIDs))
    72         self.logger.infoPair("Merged but still on local disk", "%d" % len(mergedLocalIDs))
    73         self.logger.infoPair("Purged but still on datastore", "%d" % len(purgedDatastoreIDs))
    74         self.logger.infoPair("Purged but still on local disk", "%d" % len(purgedLocalIDs))
     82        deleteFromDatastoreIDs = loadedDatastoreIDs + purgedDatastoreIDs
     83        deleteFromLocalIDs = mergedLocalIDs + purgedLocalIDs
     84
     85        # report to log what we are going to do
     86        self.logger.infoPair("To delete from datastore", "%d" % len(deleteFromDatastoreIDs))
     87        self.logger.infoPair("To delete from DXLayer", "%d" % len(deleteFromDxLayerIDs))
     88        self.logger.infoPair("To delete from local disk", "%d" % len(deleteFromLocalIDs))
    7589   
     90        # delete stuff from local disk
    7691        if self.config.deleteLocal:
    77             self.logger.infoSeparator()
    7892            count = 0
    79             ids = mergedLocalIDs + purgedLocalIDs
    80             for id in ids:
     93            for id in deleteFromLocalIDs:
    8194       
    8295                if Batch.deleteFromDisk(self.logger, self.config.basePath, batchType, self.config.dvoLabel, id):
    … …  
    8497                    count = count + 1
    8598   
    86             self.logger.infoSeparator()
    87             self.logger.infoPair("Removed from local disk", "%d" % count)
    88             self.logger.infoPair("Remaining on local disk", "%d" % (len(ids) - count))
    89        
     99            self.reportResults("local disk", deleteFromLocalIDs, count)
    90100   
     101        # remove stuff from datastore
    91102        if self.config.deleteDatastore:
    92             self.logger.infoSeparator()
    93103            count = 0
    94             ids = loadedDatastoreIDs + purgedDatastoreIDs
    95             for id in ids:
     104            for id in deleteFromDatastoreIDs:
    96105       
    97106                batchName = Batch.getNameFromID(id)
    … …  
    100109                    count = count + 1
    101110   
    102             self.logger.infoSeparator()
    103             self.logger.infoPair("Removed from datastore", "%d" % count)
    104             self.logger.infoPair("Remaining on datastore", "%d" % (len(ids) - count))
     111            self.reportResults("datastore", deleteFromDatastoreIDs, count)
    105112       
     113        # remove stuff from DXLayer
    106114        if self.config.deleteDxLayer:
    107             self.logger.infoSeparator()
    108115            count = 0
    109             for id in loadedDxlayerIDs:
     116            for id in deleteFromDxLayerIDs:
    110117       
    111118                if self.dxlayer.deleteBatch(id):
    … …  
    113120                    count = count + 1
    114121   
    115             self.logger.infoSeparator()
    116             self.logger.infoPair("Removed from DXLayer", "%d" % count)
    117             self.logger.infoPair("Remaining on DXLayer", "%d" % (len(loadedDxlayerIDs) - count))
     122            self.reportResults("DXLayer", deleteFromDxLayerIDs, count)
    118123       
    119 
    120124    '''
    121125    Overrides base-class version
    … …  
    128132Start of program
    129133'''
    130 cleanup = Cleanup(sys.argv)
    131 cleanup.run()
    132 cleanup.exitProgram("finished")
     134try:
     135    cleanup = Cleanup(sys.argv)
     136    cleanup.run()
     137    cleanup.exitProgram("completed")
     138except Exception, e:
     139    print str(e)
     140    traceback.print_exc()
Note: See TracChangeset for help on using the changeset viewer.