From e78f7b33e624160a72d5cce8bcfa8fb78c8e5b53 Mon Sep 17 00:00:00 2001 From: LinaresToine Date: Mon, 26 Feb 2024 02:07:48 -0600 Subject: [PATCH] Update logging messages and their level --- .../RetryManager/Modifier/MemoryModifier.py | 31 +++++++++---------- .../RetryManager/RetryManagerPoller.py | 8 ++--- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py b/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py index b3a5adb83c9..26f1dc1e31c 100644 --- a/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py +++ b/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py @@ -3,11 +3,14 @@ """ _MemoryModifier_ +config.RetryManager.modifiers = {50660: 'MemoryModifier'} config.RetryManager.section_('MemoryModifier') config.RetryManager.MemoryModifier.section_('default') -config.RetryManager.MemoryModifier.default.maxMemory = 2000 # Memory/cpu in MB +config.RetryManager.MemoryModifier.default.settings = {'requiresModify': False, 'addMemoryPerCore': 200, 'maxMemoryPerCore': 2000} +config.RetryManager.MemoryModifier.section_('Processing') +config.RetryManager.MemoryModifier.Processing.settings = {'requiresModify': True, 'addMemoryPerCore': 200, 'maxMemoryPerCore': 2500} config.RetryManager.MemoryModifier.section_('merge') -config.RetryManager.MemoryModifier.merge.maxMemory = 3000 # Memory/cpu in MB +config.RetryManager.MemoryModifier.merge.settings = {'requiresModify': True, 'multiplyMemoryPerCore': 1.2, 'maxMemoryPerCore': 3000} """ import pickle @@ -40,7 +43,7 @@ def changeJobPkl(self, pklFile, jobPKL, newMemory): Modifies the pklFile job.pkl by changing the estimatedMemoryUsage to a new_memory value """ - logging.info('MemoryModifier.changeJobPkl: Modifying {} job memory. Previous value: {}. New value: {}'.format(jobPKL['jobType'], jobPKL['estimatedMemoryUsage'], newMemory)) + logging.info('MemoryModifier modifying %s job pkl file. Previous value: %d. New value: %d', jobPKL['jobType'], jobPKL['estimatedMemoryUsage'], newMemory) jobPKL['estimatedMemoryUsage'] = newMemory self.savePKL(pklFile, jobPKL) @@ -50,18 +53,16 @@ def checkNewJobPkl(pklFile): print (data['estimatedMemoryUsage']) def getNewMemory(self, jobPKL, settings): - maxMemPerCore = settings['maxMemory'] + maxMemPerCore = settings['maxMemoryPerCore'] currentMem = jobPKL['estimatedMemoryUsage'] currentMemPerCore = currentMem/jobPKL['numberOfCores'] - if 'multiplyMemory' in settings: - newMemPerCore = currentMemPerCore * settings['multiplyMemory'] - elif 'addMemory' in settings: - newMemPerCore = currentMemPerCore + settings['addMemory'] + if 'multiplyMemoryPerCore' in settings: + newMemPerCore = currentMemPerCore * settings['multiplyMemoryPerCore'] + elif 'addMemoryPerCore' in settings: + newMemPerCore = currentMemPerCore + settings['addMemoryPerCore'] else: newMemPerCore = currentMemPerCore - logging.info('No increment values were given in the MemoryModifier parameter') - logging.info('No memory modification performed') if newMemPerCore > maxMemPerCore: newMemPerCore = maxMemPerCore @@ -86,19 +87,17 @@ def modifyJob(self, job): try: settings = self.getModifierParam(job['jobType'], 'settings') except: - logging.exception('Error while getting the MemoryModifier settings parameter. Not modifying memory') + logging.debug('MemoryModifier did not get settings parameter for job type %s. Not modifying memory', job['jobType']) return if not 'requiresModify' in settings: - logging.info('requiresModify not specified') - logging.info('Not performing any modifications') + logging.debug('MemoryModifer for job type %s does not specify requiresModify. Not modifying memory',job['jobType']) return elif not settings['requiresModify']: - logging.info('requiresModify set to False') - logging.info('Not performing any modifications') + logging.debug('MemoryModifyer for job type %s has requiresModify set to False. Not modifying memory', job['jobType']) return else: - logging.info('Modifying memory for job %d', job['id']) + logging.info('MemoryModifier modifying memory for job %d of job type %s', job['id'], job['jobType']) self.changeMemory(job, settings) diff --git a/src/python/WMComponent/RetryManager/RetryManagerPoller.py b/src/python/WMComponent/RetryManager/RetryManagerPoller.py index 3bde8856007..b35a16c0f50 100644 --- a/src/python/WMComponent/RetryManager/RetryManagerPoller.py +++ b/src/python/WMComponent/RetryManager/RetryManagerPoller.py @@ -324,18 +324,18 @@ def selectJobModifier(self, jobList): if len(jobList) == 0: return result - for job in jobList: - exitCode = self.getJobExitCode(job) #Can and should this be setup differently? Something similar to such function may exist already + for job in jobList: try: + exitCode = self.getJobExitCode(job) if exitCode in self.typeModifierAssoc: modifierName = self.typeModifierAssoc[exitCode] modifier = self.modifiers[modifierName] modifier.modifyJob(job=job) - + logging.debug('job %d of job type %s was modified with the %s. Job %d now proceeds to retry', job['id'], job['jobType'], modifierName, job['id']) result.append(job) except Exception as ex: - msg = "Exception while checking the failure type for job %i\n" % job['id'] + msg = "Exception while checking the exit code for job %i\n" % job['id'] msg += str(ex) logging.error(msg) logging.debug("Job: %s\n", job)