idds-server 2.4.7__tar.gz → 2.6.13__tar.gz

idds_server-2.6.13/MANIFEST.in

@@ -0,0 +1,15 @@
+include README.md
+include LICENSE.rst
+recursive-include etc/idds *.template *
+recursive-include etc/idds/rest *
+recursive-include etc/idds/auth *template
+recursive-include etc/idds/website *
+recursive-include etc/idds/supervisord.d *
+recursive-include etc/idds/condor *
+recursive-include etc/condor *
+recursive-include etc/sql *
+recursive-include config_default *
+recursive-include tools/env *
+graft bin
+prune build
+prune dist

{idds_server-2.4.7/lib/idds_server.egg-info → idds_server-2.6.13}/PKG-INFO

@@ -1,39 +1,30 @@
 Metadata-Version: 2.4
 Name: idds-server
-Version: 2.4.7
-Summary: intelligent Data Delivery Service(iDDS) Package
-Author: IRIS-HEP Team
-Author-email: atlas-adc-panda@cern.ch
-License: GPL
+Version: 2.6.13
+Summary: intelligent Distributed Dispatch and Scheduling Service (iDDS) - Server Package
+Author-email: PanDA Team <atlas-adc-panda@cern.ch>
+License-Expression: Apache-2.0
 Project-URL: Documentation, https://github.com/HSF/iDDS/wiki
 Project-URL: Source, https://github.com/HSF/iDDS
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.6
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: pip
+Requires-Dist: idds-common
 Requires-Dist: argcomplete
 Requires-Dist: requests
 Requires-Dist: SQLAlchemy
 Requires-Dist: urllib3
 Requires-Dist: retrying
-Requires-Dist: mod_wsgi
 Requires-Dist: flask
 Requires-Dist: stomp.py
-Requires-Dist: cx-Oracle
 Requires-Dist: oracledb
-Requires-Dist: unittest2
-Requires-Dist: pep8
-Requires-Dist: flake8
-Requires-Dist: pytest
-Requires-Dist: nose
-Requires-Dist: sphinx
-Requires-Dist: recommonmark
-Requires-Dist: sphinx-rtd-theme
-Requires-Dist: nevergrad
 Requires-Dist: psycopg2-binary
 Requires-Dist: pyjwt
 Requires-Dist: cryptography
@@ -45,18 +36,20 @@ Requires-Dist: oic
 Requires-Dist: cachetools
 Provides-Extra: mysql
 Requires-Dist: mysqlclient; extra == "mysql"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: license
+Provides-Extra: apache
+Requires-Dist: mod_wsgi; extra == "apache"
+Provides-Extra: dev
+Requires-Dist: unittest2; extra == "dev"
+Requires-Dist: pep8; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: nose; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: recommonmark; extra == "dev"
+Requires-Dist: sphinx-rtd-theme; extra == "dev"
+Provides-Extra: optimization
+Requires-Dist: nevergrad; extra == "optimization"
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 idds-server
 ====

{idds_server-2.4.7 → idds_server-2.6.13}/bin/idds.wsgi

@@ -13,7 +13,11 @@
 ----------------------"""
 
 import os
-os.environ['IDDS_CONFIG'] = '/opt/hostedtoolcache/Python/3.14.2/x64/etc/idds/idds.cfg'
+import sys
+
+# If IDDS_CONFIG is not already set, default to <prefix>/etc/idds/idds.cfg
+if "IDDS_CONFIG" not in os.environ:
+    os.environ["IDDS_CONFIG"] = os.path.join(sys.prefix, "etc", "idds", "idds.cfg")
 
 from idds.rest.v1.app import create_app  # noqa: E402
 

{idds_server-2.4.7 → idds_server-2.6.13}/bin/idds.wsgi.template

@@ -13,7 +13,11 @@
 ----------------------"""
 
 import os
-os.environ['IDDS_CONFIG'] = '{idds_config_path}'
+import sys
+
+# If IDDS_CONFIG is not already set, default to <prefix>/etc/idds/idds.cfg
+if "IDDS_CONFIG" not in os.environ:
+    os.environ["IDDS_CONFIG"] = os.path.join(sys.prefix, "etc", "idds", "idds.cfg")
 
 from idds.rest.v1.app import create_app  # noqa: E402
 

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/alembic.ini

@@ -3,7 +3,7 @@
 [alembic]
 # path to migration scripts
 # script_location = alembic
-script_location = /opt/idds/lib/python3.9/site-packages/idds/orm/base/alembic
+script_location = /opt/idds/lib/{python_version}/site-packages/idds/orm/base/alembic
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time

idds_server-2.4.7/etc/idds/rest/httpd-idds-443-py39-cc7.conf.install_template → idds_server-2.6.13/config_default/httpd-idds-443-py311-al9.conf

@@ -23,25 +23,46 @@ LoadModule ssl_module /usr/lib64/httpd/modules/mod_ssl.so
 
 # External modules
 LoadModule gridsite_module /usr/lib64/httpd/modules/mod_gridsite.so
-#LoadModule wsgi_module /usr/lib64/httpd/modules/mod_wsgi.so
-LoadModule wsgi_module /opt/hostedtoolcache/Python/3.14.2/x64/lib/python3.14/site-packages/mod_wsgi/server/mod_wsgi-py39.cpython-39-x86_64-linux-gnu.so
+# #LoadModule wsgi_module /usr/lib64/httpd/modules/mod_wsgi.so
+LoadModule wsgi_module /opt/idds/lib/python3.11/site-packages/mod_wsgi/server/mod_wsgi-py311.cpython-311-x86_64-linux-gnu.so
+
+<IfModule prefork.c>
+StartServers         ${IDDS_SERVER_CONF_MIN_WORKERS}
+MinSpareServers      ${IDDS_SERVER_CONF_MIN_WORKERS}
+ServerLimit          ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxSpareServers      ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxClients           ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxRequestsPerChild  100
+ThreadsPerChild      100
+</IfModule>
+
+<IfModule mpm_event_module>
+StartServers           ${IDDS_SERVER_CONF_MIN_WORKERS}
+MinSpareThreads        ${IDDS_SERVER_CONF_MIN_WORKERS}
+ServerLimit            ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxSpareThreads        ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxRequestWorkers      ${IDDS_SERVER_CONF_MAX_WORKERS}
+MaxConnectionsPerChild 100
+ThreadsPerChild        100
+</IfModule>
 
-WSGIPythonHome /opt/hostedtoolcache/Python/3.14.2/x64
-WSGIPythonPath /opt/hostedtoolcache/Python/3.14.2/x64/lib/python3.14/site-packages
+WSGIPythonHome /opt/idds
+WSGIPythonPath /opt/idds/lib/python3.11/site-packages
 
 <IfModule mod_wsgi.c>
-    WSGIDaemonProcess idds_daemon processes=25 threads=2 request-timeout=600 queue-timeout=600 python-home=/opt/hostedtoolcache/Python/3.14.2/x64 python-path=/opt/hostedtoolcache/Python/3.14.2/x64/lib/python3.14/site-packages
+    WSGIDaemonProcess idds_daemon processes=${IDDS_SERVER_CONF_NUM_WSGI} threads=${IDDS_SERVER_CONF_NUM_WSGI_THREAD} request-timeout=600 queue-timeout=600 python-home=/opt/idds python-path=/opt/idds/lib/python3.11/site-packages python-path=/opt/idds python-path=/opt/idds/lib/python3.11/site-packages
     WSGIProcessGroup idds_daemon
     WSGIApplicationGroup %GLOBAL
-    WSGIScriptAlias /idds /opt/hostedtoolcache/Python/3.14.2/x64/bin/idds.wsgi
+    WSGIScriptAlias /idds /opt/idds/bin/idds.wsgi
     # WSGIScriptAliasMatch ^/idds/(.+)$ /opt/idds/etc/idds/rest/test.wsgi
-    WSGISocketPrefix /var/log/idds/wsgisocks/wsgi
-    # WSGISocketPrefix /tmp/idds/wsgisocks/wsgi
+    WSGISocketPrefix /var/idds/wsgisocks/wsgi
     WSGIPassAuthorization On
 </IfModule>
 
-Listen 443
+ListenBackLog ${IDDS_SERVER_CONF_MAX_BACKLOG}
+
 Listen 8443
+Listen 8080
 
 RewriteEngine on
 RewriteCond %REQUEST_METHOD ^(TRACE|TRACK)
@@ -52,13 +73,14 @@ TraceEnable off
 Alias "/website"     "/opt/idds/website/data"
 Alias "/monitor"     "/opt/idds/monitor/data"
 
-<VirtualHost *:443>
-    # ServerName aipanda182.cern.ch:443
+<VirtualHost *:8443>
+    # ServerName aipanda182.cern.ch:8443
     ServerAdmin wguan@cern.ch
 
     SSLEngine on
     SSLCertificateFile /etc/grid-security/hostcert.pem
     SSLCertificateKeyFile /etc/grid-security/hostkey.pem
+    SSLCertificateChainFile /etc/grid-security/chain.pem
     SSLCACertificatePath /etc/grid-security/certificates
     SSLCARevocationPath /etc/grid-security/certificates
     SSLVerifyClient optional
@@ -74,16 +96,8 @@ Alias "/monitor"     "/opt/idds/monitor/data"
     ErrorLog /var/log/idds/httpd_error_log
     TransferLog /var/log/idds/httpd_access_log
 
-    <IfModule mod_wsgi.c>
-        WSGIDaemonProcess idds_daemon processes=25 threads=2 request-timeout=600 queue-timeout=600 python-home=/opt/hostedtoolcache/Python/3.14.2/x64 python-path=/opt/hostedtoolcache/Python/3.14.2/x64/lib/python3.14/site-packages
-        WSGIProcessGroup idds_daemon
-        WSGIApplicationGroup %GLOBAL
-        WSGIScriptAlias /idds /opt/hostedtoolcache/Python/3.14.2/x64/bin/idds.wsgi
-        # WSGIScriptAliasMatch ^/idds/(.+)$ /opt/idds/etc/idds/rest/test.wsgi
-        # WSGISocketPrefix /var/log/idds/wsgisocks/wsgi
-        WSGISocketPrefix /tmp/idds/wsgisocks/wsgi
-        WSGIPassAuthorization On
-    </IfModule>
+    # 10G
+    LimitRequestBody 10737418240
 
     # Proxy authentication via mod_gridsite
     <LocationMatch /auth/x509_proxy>
@@ -96,22 +110,80 @@ Alias "/monitor"     "/opt/idds/monitor/data"
     </LocationMatch>
 
     <LocationMatch "^/idds">
+        GridSiteIndexes on
+        # GridSiteAuth on
+        GridSiteDNlists /etc/grid-security/dn-lists/
+        GridSiteGSIProxyLimit 16
+        GridSiteEnvs on
+        GridSiteACLPath /opt/idds/etc/idds/rest/gacl
+        # GridSiteMethods GET
+    </LocationMatch>
+
+    <Directory /opt/idds/lib/python3.11/site-packages>
+        # Order deny,allow
+        # Allow from all
+        # Require all granted
+    </Directory>
+
+    <Directory /opt/idds/bin>
+        Order deny,allow
+        Allow from all
+        Require all granted
+    </Directory>
+
+    <Directory /opt/idds/website/data>
+        Order deny,allow
+        Allow from all
+        Require all granted
+    </Directory>
+
+    <Directory /opt/idds/monitor/data>
+        Order deny,allow
+        Allow from all
+        Require all granted
+        DirectoryIndex dashboard.html
+        DirectoryIndex index.html
+    </Directory>
+</VirtualHost>
+
+<VirtualHost *:8080>
+    # ServerName aipanda182.cern.ch:8080
+    ServerAdmin wguan@cern.ch
+
+    LogLevel debug
+    ErrorLog /var/log/idds/httpd_error_log
+    TransferLog /var/log/idds/httpd_access_log
+
+    # 10G
+    LimitRequestBody 10737418240
+
+    # Proxy authentication via mod_gridsite
+    <LocationMatch /auth/x509_proxy>
         GridSiteIndexes on
         GridSiteAuth on
         GridSiteDNlists /etc/grid-security/dn-lists/
         GridSiteGSIProxyLimit 16
         GridSiteEnvs on
         GridSiteACLPath /opt/idds/etc/idds/rest/gacl
+    </LocationMatch>
+
+    <LocationMatch "^/idds">
+        GridSiteIndexes on
+        # GridSiteAuth on
+        GridSiteDNlists /etc/grid-security/dn-lists/
+        GridSiteGSIProxyLimit 16
+        GridSiteEnvs on
+        GridSiteACLPath /opt/idds/etc/idds/rest/gacl
         # GridSiteMethods GET
     </LocationMatch>
 
-    <Directory /opt/hostedtoolcache/Python/3.14.2/x64/lib/python3.14/site-packages>
+    <Directory /opt/idds/lib/python3.11/site-packages>
         # Order deny,allow
         # Allow from all
         # Require all granted
     </Directory>
 
-    <Directory /opt/hostedtoolcache/Python/3.14.2/x64/bin>
+    <Directory /opt/idds/bin>
         Order deny,allow
         Allow from all
         Require all granted

idds_server-2.6.13/config_default/logrotate_idds

@@ -0,0 +1,15 @@
+/var/log/idds/logrotate.log{
+    daily
+    postrotate
+        /usr/bin/supervisorctl stop all > /dev/null 2>/dev/null || true
+        /usr/bin/supervisorctl start all > /dev/null 2>/dev/null || true
+    endscript
+}
+/var/log/idds/*.log {
+    daily
+    missingok
+    rotate 3
+    size 2G
+    compress
+    delaycompress
+}

idds_server-2.6.13/config_default/panda.cfg

@@ -0,0 +1,12 @@
+[panda]
+
+# panda_url_ssl = https://pandaserver-doma.cern.ch:25443/server/panda
+# panda_url = http://pandaserver-doma.cern.ch:25080/server/panda
+panda_monitor_url = https://panda-doma.cern.ch
+# PANDA_AUTH_VO = panda_dev
+panda_auth = oidc
+panda_auth_vo = Rubin/production
+panda_config_root = /opt/idds/config/.panda/
+panda_url_ssl = https://pandaserver-doma.cern.ch:25443/api/v1
+panda_url = http://pandaserver-doma.cern.ch:25080/api/v1
+pandacache_url = https://pandaserver-doma.cern.ch:25443/api/v1

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_httpd.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/httpd_access_log
 stderr_logfile=/var/log/idds/httpd_error_log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=3
-stderr_logfile_backups=3
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds.ini

@@ -16,8 +16,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_clerk.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_finisher.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_poller.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_receiver.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_submitter.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_transformer.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_idds_trigger.ini

@@ -17,8 +17,8 @@ stdout_logfile=/var/log/idds/%(program_name)s-stdout.log
 stderr_logfile=/var/log/idds/%(program_name)s-stderr.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

{idds_server-2.4.7 → idds_server-2.6.13}/config_default/supervisord_iddsfake.ini

@@ -15,8 +15,8 @@ stdout_logfile=/var/log/idds/Conductor.log
 stderr_logfile=/var/log/idds/Receiver.log
 stdout_logfile_maxbytes=2GB
 stderr_logfile_maxbytes=2GB
-stdout_logfile_backups=5
-stderr_logfile_backups=5
+stdout_logfile_backups=2
+stderr_logfile_backups=2
 redirect_stderr=false
 autorestart=true
 stopsignal=TERM

idds_server-2.6.13/etc/condor/collector/09_flin_condor.config

@@ -0,0 +1,3 @@
+SCHEDD_DEBUG = D_FULLDEBUG, D_SECURITY
+
+SEC_DEFAULT_AUTHENTICATION_METHODS = CLAIMTOBE, $(SEC_DEFAULT_AUTHENTICATION_METHODS)

idds_server-2.6.13/etc/condor/submitter/00personal_condor.config

@@ -0,0 +1,43 @@
+##  What machine is your central manager?
+
+CONDOR_HOST = aipanda101.cern.ch
+
+## Pool's short description
+
+COLLECTOR_NAME = IDDS_POOL
+
+##  When is this machine willing to start a job? 
+
+START = TRUE
+
+
+##  When to suspend a job?
+
+SUSPEND = FALSE
+
+
+##  When to nicely stop a job?
+##  (as opposed to killing it instantaneously)
+
+PREEMPT = FALSE
+
+
+##  When to instantaneously kill a preempting job
+##  (e.g. if a job is in the pre-empting stage for too long)
+
+KILL = FALSE
+
+##  This macro determines what daemons the condor_master will start and keep its watchful eyes on.
+##  The list is a comma or space separated list of subsystem names
+
+# DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
+DAEMON_LIST = MASTER, SCHEDD
+
+ALLOW_READ = *
+ALLOW_WRITE = aipanda*.cern.ch
+
+#USE_SHARED_PORT = True
+#SHARED_PORT_ARGS = -p 9619
+
+HIGHPORT = 9700
+LOWPORT = 9600

idds_server-2.6.13/etc/idds/condor/server/00personal_condor.config

@@ -0,0 +1,42 @@
+##  What machine is your central manager?
+
+CONDOR_HOST = $(FULL_HOSTNAME)
+
+## Pool's short description
+
+COLLECTOR_NAME = IDDS_POOL
+
+##  When is this machine willing to start a job? 
+
+START = TRUE
+
+
+##  When to suspend a job?
+
+SUSPEND = FALSE
+
+
+##  When to nicely stop a job?
+##  (as opposed to killing it instantaneously)
+
+PREEMPT = FALSE
+
+
+##  When to instantaneously kill a preempting job
+##  (e.g. if a job is in the pre-empting stage for too long)
+
+KILL = FALSE
+
+##  This macro determines what daemons the condor_master will start and keep its watchful eyes on.
+##  The list is a comma or space separated list of subsystem names
+
+DAEMON_LIST = COLLECTOR, MASTER, NEGOTIATOR, SCHEDD, STARTD
+
+ALLOW_READ = *
+ALLOW_WRITE = aipanda*.cern.ch
+
+#USE_SHARED_PORT = True
+#SHARED_PORT_ARGS = -p 9619
+
+HIGHPORT = 9700
+LOWPORT = 9600

idds_server-2.4.7/config_default/panda.cfg → idds_server-2.6.13/etc/panda/panda.cfg.template

@@ -1,4 +1,7 @@
 [panda]
+# panda_monitor_url = https://panda-doma.cern.ch
+# panda_url = http://ai-idds-01.cern.ch:25080/server/panda
+# panda_url_ssl = https://ai-idds-01.cern.ch:25443/server/panda
 
 panda_url_ssl = https://pandaserver-doma.cern.ch:25443/server/panda
 panda_url = http://pandaserver-doma.cern.ch:25080/server/panda
@@ -6,4 +9,4 @@ panda_monitor_url = https://panda-doma.cern.ch
 # PANDA_AUTH_VO = panda_dev
 panda_auth = oidc
 panda_auth_vo = Rubin/production
-panda_config_root = /opt/idds/config/.panda/
+panda_config_root = /tmp/.idds/

{idds_server-2.4.7 → idds_server-2.6.13}/lib/idds/agents/carrier/finisher.py

@@ -319,6 +319,7 @@ class Finisher(Poller):
                         # some files are missing, poll it.
                         self.logger.info(log_pre + "UpdateProcessingEvent(processing_id: %s)" % pr['processing_id'])
                         event = UpdateProcessingEvent(publisher_id=self.id, processing_id=pr['processing_id'],
+                                                      content=event._content if event else None,
                                                       counter=event._counter + 1 if event else 0)
                         event.set_terminating()
                         self.event_bus.send(event)

{idds_server-2.4.7 → idds_server-2.6.13}/lib/idds/agents/carrier/plugins/base.py

@@ -79,11 +79,11 @@ class BaseSubmitter(object):
         # task_param_map['transPath'] = 'https://pandaserver-doma.cern.ch/trf/user/run_workflow_wrapper'
         task_param_map['transPath'] = 'https://storage.googleapis.com/drp-us-central1-containers/run_workflow_wrapper'
 
-        task_param_map['processingType'] = None
+        task_param_map['processingType'] = work.processing_type
         task_param_map['prodSourceLabel'] = 'managed'   # managed, test, ptest
 
         # task_param_map['noWaitParent'] = True
-        task_param_map['taskType'] = 'iDDS'
+        task_param_map['taskType'] = work.task_type if work.task_type else 'iDDS'
         task_param_map['coreCount'] = work.core_count
         task_param_map['skipScout'] = True
         task_param_map['ramCount'] = work.total_memory / work.core_count if work.core_count else work.total_memory
@@ -119,6 +119,7 @@ class BaseSubmitter(object):
         elif work.input_datasets:
             for i, (input_file_name, input_dataset_name) in enumerate(work.input_datasets.items()):
                 input_dataset_name = input_dataset_name.replace("$WORKFLOWID", str(work.request_id))
+                input_dataset_name = input_dataset_name.replace("${WORKFLOWID}", str(work.request_id))
                 tmp_dict = {
                     "type": "template",
                     "param_type": "input",

{idds_server-2.4.7 → idds_server-2.6.13}/lib/idds/agents/carrier/plugins/panda.py

@@ -95,7 +95,7 @@ class PandaSubmitterPoller(BaseSubmitterPoller):
             if work.parent_workload_id:
                 parent_tid = work.parent_workload_id
             return_code = Client.insertTaskParams(task_params, verbose=True, parent_tid=parent_tid)
-            if return_code[0] == 0 and return_code[1][0] is True:
+            if return_code[0] == 0 and return_code[1] and return_code[1][0] in [True, 0]:
                 try:
                     ret_string = str(return_code[1][1])
                     ret_string = ret_string.replace("succeeded. new jediTaskID=", "")
@@ -103,11 +103,15 @@ class PandaSubmitterPoller(BaseSubmitterPoller):
                         task_id = int(ret_string.split("=")[1])
                     elif "=" in ret_string:
                         task_id = int(ret_string.split("=")[1])
+                    else:
+                        task_id = int(ret_string)
                     return task_id, None
                 except Exception as ex:
                     if logger:
                         logger.warn(log_prefix + "task id is not retruned: (%s) is not task id: %s" % (return_code[1][1], str(ex)))
-                    if return_code[1][1] and 'jediTaskID=' in return_code[1][1]:
+                    if isinstance(return_code[1][1], int):
+                        return return_code[1][1], None
+                    elif return_code[1][1] and 'jediTaskID=' in return_code[1][1]:
                         parts = return_code[1][1].split(" ")
                         for part in parts:
                             if 'jediTaskID=' in part: