From 97d869b353585a63d304654812194e0546a68b34 Mon Sep 17 00:00:00 2001 From: Daniel Abercrombie Date: Tue, 13 Nov 2018 16:17:16 -0500 Subject: [PATCH 1/5] Not using this yet --- workflowwebtools/predict/evaluate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflowwebtools/predict/evaluate.py b/workflowwebtools/predict/evaluate.py index be30302..7394b5a 100644 --- a/workflowwebtools/predict/evaluate.py +++ b/workflowwebtools/predict/evaluate.py @@ -2,7 +2,7 @@ A module that evaluates a model and returns the prediction """ -from cmstoolbox import sitereadiness +#from cmstoolbox import sitereadiness From 016db1fd843a6b60ea34adffc9b2f2ed77b8e605 Mon Sep 17 00:00:00 2001 From: Daniel Abercrombie Date: Thu, 15 Nov 2018 10:17:03 -0500 Subject: [PATCH 2/5] Filter out T0_CH_CERN --- workflowwebtools/__init__.py | 2 +- workflowwebtools/workflowinfo.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/workflowwebtools/__init__.py b/workflowwebtools/__init__.py index 8562243..09dd725 100644 --- a/workflowwebtools/__init__.py +++ b/workflowwebtools/__init__.py @@ -4,6 +4,6 @@ :author: Daniel Abercrombie """ -__version__ = '0.7.1' +__version__ = '0.7.2' __all__ = [] diff --git a/workflowwebtools/workflowinfo.py b/workflowwebtools/workflowinfo.py index aa0e446..62acd14 100644 --- a/workflowwebtools/workflowinfo.py +++ b/workflowwebtools/workflowinfo.py @@ -385,7 +385,8 @@ def site_to_run(self, task): for site in site_set: clean_site = re.sub(r'_(ECHO_)?(Disk|MSS)$', '', site) if clean_site not in out_list and clean_site and \ - clean_site in all_site_list: + clean_site in all_site_list and \ + 'T0_' not in clean_site: out_list.append(clean_site) out_list.sort() From 6face3a288796ffd975823f2009e30954dd4e861 Mon Sep 17 00:00:00 2001 From: Daniel Abercrombie Date: Fri, 16 Nov 2018 15:18:40 -0500 Subject: [PATCH 3/5] Split up 'special' actions by selected action --- workflowwebtools/__init__.py | 2 +- workflowwebtools/actionshistorylink.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/workflowwebtools/__init__.py b/workflowwebtools/__init__.py index 09dd725..d2b8f4b 100644 --- a/workflowwebtools/__init__.py +++ b/workflowwebtools/__init__.py @@ -4,6 +4,6 @@ :author: Daniel Abercrombie """ -__version__ = '0.7.2' +__version__ = '0.7.3' __all__ = [] diff --git a/workflowwebtools/actionshistorylink.py b/workflowwebtools/actionshistorylink.py index a679c73..0eeb7f2 100644 --- a/workflowwebtools/actionshistorylink.py +++ b/workflowwebtools/actionshistorylink.py @@ -34,7 +34,8 @@ def dump_json(file_name=None): for workflow in actions: for subtask in history.get_step_list(workflow): - if actions[workflow]['Action'] in ['acdc', 'recovery']: + action = actions[workflow]['Action'] + if action in ['acdc', 'recovery']: parameters = actions[workflow]['Parameters'].get( '/'.join(subtask.split('/')[2:]), {}) else: @@ -52,7 +53,10 @@ def dump_json(file_name=None): 'parameters': parameters } - output[subtask]['parameters']['action'] = actions[workflow]['Action'] + + output[subtask]['parameters']['action'] = \ + action if action != 'special' else \ + actions[workflow]['Parameters']['action'] if file_name: with open(file_name, 'w') as output_file: From d0a81f92c853127ba0e378e20909dd3270b4de5a Mon Sep 17 00:00:00 2001 From: Daniel Abercrombie Date: Fri, 16 Nov 2018 15:29:56 -0500 Subject: [PATCH 4/5] Add function to gather everything for monitoring --- workflowwebtools/workflowinfo.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/workflowwebtools/workflowinfo.py b/workflowwebtools/workflowinfo.py index 62acd14..50065fc 100644 --- a/workflowwebtools/workflowinfo.py +++ b/workflowwebtools/workflowinfo.py @@ -451,6 +451,22 @@ def get_prep_id(self): return str(self.get_workflow_parameters().get('PrepID', 'NoPrepID')) + def get_monitoring_info(self): + """ + :returns: the information to send to CMSMONIT + :rtype: dict + """ + # Dummy call to get self.explanations filled + self.get_explanation(0) + + return { + 'errors': self.get_errors(True), + 'prepID': self.get_prep_id(), + 'params': self.get_workflow_parameters(), + 'recovery': self.get_recovery_info(), + 'logs': self.explanations + } + class PrepIDInfo(Info): """ From 9ab9a7c1cc3aea0d061a6f5de397f49608863892 Mon Sep 17 00:00:00 2001 From: Daniel Abercrombie Date: Wed, 16 Jan 2019 10:49:09 -0500 Subject: [PATCH 5/5] Take out message that shows every time. --- workflowwebtools/errorutils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/workflowwebtools/errorutils.py b/workflowwebtools/errorutils.py index 7c664dd..f7d7c18 100644 --- a/workflowwebtools/errorutils.py +++ b/workflowwebtools/errorutils.py @@ -59,7 +59,6 @@ def open_location(data_location): "SELECT NAME FROM CMS_UNIFIED_ADMIN.workflow WHERE lower(STATUS) LIKE '%manual%'") wkfs = [row for row, in oracle_cursor] oracle_db_conn.close() - cherrypy.log('Number of workflows from database: %i' % len(wkfs)) return errors_from_list(wkfs) raw = None