htcondor: migrate to myschedd

reanahub · Jul 9, 2020 · d555017 · d555017
1 parent 04042bf
commit d555017
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 20 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -3,6 +3,7 @@ Authors
 
 The list of contributors in alphabetical order:
 
+- `Adelina Lintuluoto <https://orcid.org/0000-0002-0726-1452>`_
 - `Anton Khodak <https://orcid.org/0000-0003-3263-4553>`_
 - `Diego Rodriguez <https://orcid.org/0000-0003-0649-2002>`_
 - `Dinos Kousidis <https://orcid.org/0000-0002-4914-4289>`_

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,7 @@ Version master (UNRELEASED)
 - Instantiates jobs in the configured runtime namespace.
 - Enables running tests locally on MacOS.
 - Adds Black formatter support.
+- Amends CERN HTCondor compute backend to use the new myschedd connection library
 
 Version 0.6.1 (2020-05-25)
 --------------------------

diff --git a/Dockerfile b/Dockerfile
@@ -26,8 +26,8 @@ RUN if echo "$COMPUTE_BACKENDS" | grep -q "htcondorcern"; then \
       export DEBIAN_FRONTEND=noninteractive ;\
       apt-get -yq install wget alien gnupg2 ;\
       wget -O ngbauth-submit.rpm http://linuxsoft.cern.ch/internal/repos/batch7-stable/x86_64/os/Packages/ngbauth-submit-0.23-1.el7.noarch.rpm; \
-      wget -O cernbatchsubmit.rpm http://linuxsoft.cern.ch/internal/repos/batch7-stable/x86_64/os/Packages/cernbatchsubmit-0.1.0-1.el7.x86_64.rpm; \
-      yes | alien -i cernbatchsubmit.rpm; \
+      wget -O myschedd.rpm http://linuxsoft.cern.ch/internal/repos/batch7-stable/x86_64/os/Packages/myschedd-1.5-1.el7.x86_64.rpm; \
+      yes | alien -i myschedd.rpm; \
       yes | alien -i ngbauth-submit.rpm; \
       wget -qO - http://research.cs.wisc.edu/htcondor/debian/HTCondor-Release.gpg.key | apt-key add -; \
       echo "deb https://research.cs.wisc.edu/htcondor/debian/8.9/buster buster contrib" >>/etc/apt/sources.list; \
@@ -42,7 +42,9 @@ RUN if echo "$COMPUTE_BACKENDS" | grep -q "slurmcern"; then \
                           --no-install-recommends; \
     fi
 
-ADD etc/cernsubmit.yaml /etc/condor/
+RUN mkdir -p /etc/myschedd 
+ADD etc/myschedd.yaml /etc/myschedd/
+
 ADD etc/10_cernsubmit.config /etc/condor/config.d/
 
 ADD etc/ngbauth-submit /etc/sysconfig/

diff --git a/etc/10_cernsubmit.config b/etc/10_cernsubmit.config
@@ -1,5 +1,10 @@
-CONDOR_HOST = tweetybird04.cern.ch
-LOCAL_CONFIG_FILE = /usr/bin/cernbatchsubmit|
+CONDOR_HOST = tweetybird03.cern.ch, tweetybird04.cern.ch
+
+SKIP_LOCAL_CONFIG_FILE=$ENV(SKIP_LOCAL_CONFIG_FILE:FALSE)
+if ! $(SKIP_LOCAL_CONFIG_FILE)
+    LOCAL_CONFIG_FILE = /usr/bin/myschedd.sh |
+endif
+
 SEC_CLIENT_AUTHENTICATION_METHODS = KERBEROS
 SEC_CREDENTIAL_PRODUCER = /usr/bin/batch_krb5_credential
 FILESYSTEM_DOMAIN = cern.ch

diff --git a/etc/cernroot.crt b/etc/cernroot.crt
diff --git a/etc/cernsubmit.yaml b/etc/cernsubmit.yaml
diff --git a/etc/myschedd.yaml b/etc/myschedd.yaml
@@ -0,0 +1,24 @@
+wtfis:
+  endpoint: https://wtfis.cern.ch:9008
+  resolve_url: true
+bump:
+  maxrunningjobs: 8000
+pools:
+  share:
+    standard:
+      - bigbird08.cern.ch
+      - bigbird09.cern.ch
+      - bigbird10.cern.ch
+      - bigbird11.cern.ch
+      - bigbird12.cern.ch
+      - bigbird13.cern.ch
+      - bigbird14.cern.ch
+      - bigbird15.cern.ch
+      - bigbird16.cern.ch
+      - bigbird17.cern.ch
+      - bigbird18.cern.ch
+      - bigbird19.cern.ch
+  tzero:
+    standard:
+      - tbird02.cern.ch
+
diff --git a/reana_job_controller/htcondorcern_job_manager.py b/reana_job_controller/htcondorcern_job_manager.py
@@ -15,7 +15,6 @@
 from shutil import copyfile
 
 import classad
-import htcondor
 from flask import current_app
 from reana_db.database import Session
 from reana_db.models import Workflow
@@ -90,11 +89,15 @@ def __init__(
         self.workflow = self._get_workflow()
         self.unpacked_img = unpacked_img
 
+        # We need to import the htcondor package later during runtime after the Kerberos environment is fully initialised.
+        # Without a valid Kerberos ticket, importing will exit with "ERROR: Unauthorized 401 - do you have authentication tokens? Error "/usr/bin/myschedd.sh |"
+        initialize_krb5_token(workflow_uuid=self.workflow_uuid)
+        globals()["htcondor"] = __import__("htcondor")
+
     @JobManager.execution_hook
     def execute(self):
         """Execute / submit a job with HTCondor."""
         os.chdir(self.workflow_workspace)
-        initialize_krb5_token(workflow_uuid=self.workflow_uuid)
         job_ad = classad.ClassAd()
         job_ad["JobDescription"] = (
             self.workflow.get_full_workflow_name() + "_" + self.job_name