optimzer run workflow tools

HSF · Aug 6, 2024 · 6f06782 · 6f06782
1 parent 6da59b2
commit 6f06782
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 18 deletions.
diff --git a/main/lib/idds/tests/panda_test.py b/main/lib/idds/tests/panda_test.py
@@ -74,6 +74,7 @@
 task_ids = [169786, 169787]
 task_ids = [i for i in range(10173, 10204)]
 task_ids = [108, 109, 106, 107, 112]
+task_ids = [i for i in range(2921, 2927)]
 for task_id in task_ids:
     print("Killing %s" % task_id)
     ret = Client.killTask(task_id, verbose=True)

diff --git a/main/tools/env/install_idds.sh b/main/tools/env/install_idds.sh
@@ -17,7 +17,7 @@ cp workflow/bin/run_workflow_wrapper ~/www/wiscgroup/
 echo cp workflow/bin/run_workflow_wrapper /eos/user/w/wguan/www/
 cp workflow/bin/run_workflow_wrapper /eos/user/w/wguan/www/
 
-echo scp workflow/bin/run_workflow_wrapper root@ai-idds-04:/data/iddssv1/srv/var/trf/user/
-scp workflow/bin/run_workflow_wrapper root@ai-idds-04:/data/iddssv1/srv/var/trf/user/
+# echo scp workflow/bin/run_workflow_wrapper root@ai-idds-04:/data/iddssv1/srv/var/trf/user/
+# scp workflow/bin/run_workflow_wrapper root@ai-idds-04:/data/iddssv1/srv/var/trf/user/
 
 rm -fr workflow/bin/run_workflow_wrapper
diff --git a/main/tools/env/setup_panda.sh b/main/tools/env/setup_panda.sh
@@ -27,6 +27,31 @@ if [ "$instance" == "k8s" ]; then
     export PANDA_SYS=/afs/cern.ch/user/w/wguan/workdisk/iDDS/.conda/iDDS/
     # export PANDA_CONFIG_ROOT=/afs/cern.ch/user/w/wguan/workdisk/iDDS/main/etc/panda/
     export PANDA_CONFIG_ROOT=~/.panda/
+elif [ "$instance" == "bnl" ]; then
+    export PANDA_AUTH=oidc
+
+    export PANDA_URL_SSL=https://pandaserver01.sdcc.bnl.gov:25443/server/panda
+    export PANDA_URL=https://pandaserver01.sdcc.bnl.gov:25443/server/panda
+    export PANDACACHE_URL=https://pandaserver01.sdcc.bnl.gov:25443/server/panda
+    export PANDAMON_URL=https://pandamon01.sdcc.bnl.gov
+    export PANDA_AUTH=oidc
+    export PANDA_AUTH_VO=EIC
+    export PANDA_USE_NATIVE_HTTPLIB=1
+    export PANDA_BEHIND_REAL_LB=1
+
+    # export PANDA_AUTH_VO=panda_dev
+    # export PANDA_AUTH_VO=Rubin:production
+
+    export PANDACACHE_URL=$PANDA_URL_SSL
+    export PANDA_SYS=/afs/cern.ch/user/w/wguan/workdisk/iDDS/.conda/iDDS/
+
+    export PANDA_BEHIND_REAL_LB=true
+    export PANDA_VERIFY_HOST=off
+    export PANDA_CONFIG_ROOT=~/.panda/
+
+    unset IDDS_HOST
+    # doma
+    # export IDDS_HOST=https://aipanda105.cern.ch:443/idds
 elif [ "$instance" == "usdf_dev" ]; then
     export PANDA_AUTH=oidc
     export PANDA_BEHIND_REAL_LB=true
@@ -97,14 +122,19 @@ elif [ "$instance" == "new" ]; then
     PANDA_WORKING_GROUP=EIC
     PANDA_VO=wlcg
 elif [ "$instance" == "doma_k8s" ]; then
-    export PANDA_URL_SSL=https://panda-doma-k8s-panda.cern.ch/server/panda
-    export PANDA_URL=http://panda-doma-k8s-panda.cern.ch:25080/server/panda
-    export PANDACACHE_URL=https://panda-doma-k8s-panda.cern.ch/server/panda
-    export PANDAMON_URL=https://panda-doma-bigmon.cern.ch
+    # export PANDA_URL_SSL=https://panda-doma-k8s-panda.cern.ch/server/panda
+    # export PANDA_URL=http://panda-doma-k8s-panda.cern.ch:25080/server/panda
+    # export PANDACACHE_URL=https://panda-doma-k8s-panda.cern.ch/server/panda
+    # export PANDAMON_URL=https://panda-doma-bigmon.cern.ch
+    export PANDA_URL_SSL=https://pandaserver-doma.cern.ch/server/panda
+    export PANDA_URL=http://pandaserver-doma.cern.ch:25080/server/panda
+    export PANDACACHE_URL=https://pandaserver-doma.cern.ch/server/panda
+    export PANDAMON_URL=https://panda-doma.cern.ch
+
     export PANDA_AUTH=oidc
     export PANDA_AUTH_VO=Rubin.production
-    export PANDA_AUTH_VO=EIC
-    export PANDA_AUTH_VO=Rubin
+    # export PANDA_AUTH_VO=EIC
+    # export PANDA_AUTH_VO=Rubin
     export PANDA_USE_NATIVE_HTTPLIB=1
     export PANDA_BEHIND_REAL_LB=true
 
@@ -119,7 +149,8 @@ elif [ "$instance" == "doma_k8s" ]; then
     export IDDS_OIDC_TOKEN_FILE=~/.idds/.token_doma_k8s
 else
     export PANDA_AUTH=oidc
-    export PANDA_URL_SSL=https://pandaserver-doma.cern.ch:25443/server/panda
+    # export PANDA_URL_SSL=https://pandaserver-doma.cern.ch:25443/server/panda
+    export PANDA_URL_SSL=https://pandaserver-doma.cern.ch:443/server/panda
     export PANDA_URL=http://pandaserver-doma.cern.ch:25080/server/panda
     export PANDAMON_URL=https://panda-doma.cern.ch
     # export PANDA_AUTH_VO=panda_dev

diff --git a/monitor/data/conf.js b/monitor/data/conf.js
@@ -1,9 +1,9 @@
 
 var appConfig = {
-    'iddsAPI_request': "https://lxplus952.cern.ch:443/idds/monitor_request/null/null",
-    'iddsAPI_transform': "https://lxplus952.cern.ch:443/idds/monitor_transform/null/null",
-    'iddsAPI_processing': "https://lxplus952.cern.ch:443/idds/monitor_processing/null/null",
-    'iddsAPI_request_detail': "https://lxplus952.cern.ch:443/idds/monitor/null/null/true/false/false",
-    'iddsAPI_transform_detail': "https://lxplus952.cern.ch:443/idds/monitor/null/null/false/true/false",
-    'iddsAPI_processing_detail': "https://lxplus952.cern.ch:443/idds/monitor/null/null/false/false/true"
+    'iddsAPI_request': "https://lxplus994.cern.ch:443/idds/monitor_request/null/null",
+    'iddsAPI_transform': "https://lxplus994.cern.ch:443/idds/monitor_transform/null/null",
+    'iddsAPI_processing': "https://lxplus994.cern.ch:443/idds/monitor_processing/null/null",
+    'iddsAPI_request_detail': "https://lxplus994.cern.ch:443/idds/monitor/null/null/true/false/false",
+    'iddsAPI_transform_detail': "https://lxplus994.cern.ch:443/idds/monitor/null/null/false/true/false",
+    'iddsAPI_processing_detail': "https://lxplus994.cern.ch:443/idds/monitor/null/null/false/false/true"
 }
diff --git a/workflow/bin/run_workflow b/workflow/bin/run_workflow
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # You may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ Run workflow.
 from __future__ import print_function
 
 import argparse
-import argcomplete
+# import argcomplete
 import base64
 # import json
 import logging
@@ -210,7 +210,7 @@ if __name__ == '__main__':
     arguments = sys.argv[1:]
 
     oparser = get_parser()
-    argcomplete.autocomplete(oparser)
+    # argcomplete.autocomplete(oparser)
 
     args = oparser.parse_args(arguments)
 

diff --git a/workflow/tools/make/zipheader b/workflow/tools/make/zipheader
@@ -77,6 +77,9 @@ cat <<- EOF > ${current_dir}/$cmdfile
 
 echo "current dir: " \$PWD
 
+which python
+which python3
+
 # cd ${current_dir}
 
 current_dir=\$PWD