Merge pull request #325 from HSF/dev

Dev
HSF · Jun 15, 2024 · 6a9dad7 · 6a9dad7
2 parents 62ad6b3 + bf2374b
commit 6a9dad7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/main/config_default/idds.cfg b/main/config_default/idds.cfg
@@ -98,6 +98,11 @@ plugin.receiver.channels = {"default": {"brokers": ["atlas-mb.cern.ch:61013"],
 domapandawork.num_retries = 0
 domapandawork.poll_panda_jobs_chunk_size = 2000
 
+plugin.iwork_submitter = idds.agents.carrier.plugins.panda.PandaSubmitterPoller
+plugin.iworkflow_submitter = idds.agents.carrier.plugins.panda.PandaSubmitterPoller
+plugin.iworkflow_poller = idds.agents.carrier.plugins.panda.PandaSubmitterPoller
+plugin.iwork_poller = idds.agents.carrier.plugins.panda.PandaSubmitterPoller
+
 [conductor]
 delay = 120
 replay_times = 2
@@ -130,3 +135,10 @@ plugin.notifier.channels = {"default": {"brokers": ["atlas-mb.cern.ch:61013"],
 older_than = 60
 poll_period = 1
 
+[asyncresult]
+broker_type = activemq
+brokers = atlas-test-mb.cern.ch:61013
+broker_destination = /topic/doma.idds
+broker_timeout = 360
+broker_username = domaidds
+broker_password = password
diff --git a/main/lib/idds/agents/carrier/plugins/base.py b/main/lib/idds/agents/carrier/plugins/base.py
@@ -71,7 +71,11 @@ def get_task_params(self, work):
         # task_param_map['transPath'] = 'https://storage.googleapis.com/drp-us-central1-containers/bash-c-enc'
         # task_param_map['encJobParams'] = True
         # task_param_map['transPath'] = 'https://wguan-wisc.web.cern.ch/wguan-wisc/run_workflow_wrapper'
-        task_param_map['transPath'] = 'http://pandaserver-doma.cern.ch:25080/trf/user/run_workflow_wrapper'
+        # task_param_map['transPath'] = 'https://wguan-idds.web.cern.ch/run_workflow_wrapper'
+        # task_param_map['transPath'] = 'http://pandaserver-doma.cern.ch:25080/trf/user/run_workflow_wrapper'
+        # task_param_map['transPath'] = 'https://panda-doma-k8s-panda.cern.ch/trf/user/run_workflow_wrapper'
+        task_param_map['transPath'] = 'https://pandaserver-doma.cern.ch/trf/user/run_workflow_wrapper'
+
         task_param_map['processingType'] = None
         task_param_map['prodSourceLabel'] = 'managed'   # managed, test, ptest
 

diff --git a/main/lib/idds/tests/panda_test.py b/main/lib/idds/tests/panda_test.py
@@ -4,11 +4,12 @@
 import datetime
 
 os.environ['PANDA_URL'] = 'http://pandaserver-doma.cern.ch:25080/server/panda'
-os.environ['PANDA_URL_SSL'] = 'https://pandaserver-doma.cern.ch:25443/server/panda'
+# os.environ['PANDA_URL_SSL'] = 'https://pandaserver-doma.cern.ch:25443/server/panda'
+os.environ['PANDA_URL_SSL'] = 'https://pandaserver-doma.cern.ch:443/server/panda'
 
 os.environ['PANDA_BEHIND_REAL_LB'] = "1"
-os.environ['PANDA_URL'] = 'http://rubin-panda-server-dev.slac.stanford.edu:80/server/panda'
-os.environ['PANDA_URL_SSL'] = 'https://rubin-panda-server-dev.slac.stanford.edu:8443/server/panda'
+# os.environ['PANDA_URL'] = 'http://rubin-panda-server-dev.slac.stanford.edu:80/server/panda'
+# os.environ['PANDA_URL_SSL'] = 'https://rubin-panda-server-dev.slac.stanford.edu:8443/server/panda'
 
 # os.environ['PANDA_URL_SSL'] = 'https://panda-doma-k8s-panda.cern.ch/server/panda'
 # os.environ['PANDA_URL'] = 'http://panda-doma-k8s-panda.cern.ch:25080/server/panda'
@@ -72,6 +73,7 @@
 task_ids = [30, 31, 34, 32, 33, 35]
 task_ids = [169786, 169787]
 task_ids = [i for i in range(10173, 10204)]
+task_ids = [108, 109, 106, 107, 112]
 for task_id in task_ids:
     print("Killing %s" % task_id)
     ret = Client.killTask(task_id, verbose=True)