From 8627604247ed00adb1f06ee452a68ab72bab2fdd Mon Sep 17 00:00:00 2001 From: Wen Guan Date: Mon, 21 Oct 2024 17:57:05 +0200 Subject: [PATCH] with idds to correct the cloud --- doma/lib/idds/doma/workflowv2/domapandawork.py | 8 ++++---- monitor/data/conf.js | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doma/lib/idds/doma/workflowv2/domapandawork.py b/doma/lib/idds/doma/workflowv2/domapandawork.py index f4ce8d55..0ec89a16 100644 --- a/doma/lib/idds/doma/workflowv2/domapandawork.py +++ b/doma/lib/idds/doma/workflowv2/domapandawork.py @@ -792,10 +792,10 @@ def submit_panda_task(self, processing): if 'new_retries' in processing and processing['new_retries']: new_retries = int(processing['new_retries']) task_param['taskName'] = task_param['taskName'] + "_" + str(new_retries) - if not task_param['cloud']: - cloud = self.get_site_from_cloud(task_param['PandaSite']) - if cloud: - task_param['cloud'] = cloud + cloud = self.get_site_from_cloud(task_param['PandaSite']) + if cloud and cloud != task_param['cloud']: + self.logger.info(f"Task cloud was set to {task_param['cloud']}, which is different from {cloud}, reset it to {cloud}") + task_param['cloud'] = cloud if self.has_dependency(): parent_tid = None diff --git a/monitor/data/conf.js b/monitor/data/conf.js index 74c784ef..e875986b 100644 --- a/monitor/data/conf.js +++ b/monitor/data/conf.js @@ -1,9 +1,9 @@ var appConfig = { - 'iddsAPI_request': "https://lxplus984.cern.ch:443/idds/monitor_request/null/null", - 'iddsAPI_transform': "https://lxplus984.cern.ch:443/idds/monitor_transform/null/null", - 'iddsAPI_processing': "https://lxplus984.cern.ch:443/idds/monitor_processing/null/null", - 'iddsAPI_request_detail': "https://lxplus984.cern.ch:443/idds/monitor/null/null/true/false/false", - 'iddsAPI_transform_detail': "https://lxplus984.cern.ch:443/idds/monitor/null/null/false/true/false", - 'iddsAPI_processing_detail': "https://lxplus984.cern.ch:443/idds/monitor/null/null/false/false/true" + 'iddsAPI_request': "https://lxplus972.cern.ch:443/idds/monitor_request/null/null", + 'iddsAPI_transform': "https://lxplus972.cern.ch:443/idds/monitor_transform/null/null", + 'iddsAPI_processing': "https://lxplus972.cern.ch:443/idds/monitor_processing/null/null", + 'iddsAPI_request_detail': "https://lxplus972.cern.ch:443/idds/monitor/null/null/true/false/false", + 'iddsAPI_transform_detail': "https://lxplus972.cern.ch:443/idds/monitor/null/null/false/true/false", + 'iddsAPI_processing_detail': "https://lxplus972.cern.ch:443/idds/monitor/null/null/false/false/true" }