From ca658d97a5d256293de6ad9a8d570a9b7c5211ac Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Thu, 9 May 2024 06:13:03 -0500 Subject: [PATCH] Temporarily revert changes for 23.x branch --- config/01-ce-router-defaults.conf | 9 ++--- config/01-ce-router.conf | 4 +- config/02-ce-bosco-defaults.conf | 20 +++++++--- config/02-ce-bosco.conf | 31 ++++++++-------- config/02-ce-condor-defaults.conf | 19 +++++++--- config/02-ce-condor.conf | 62 ++++++++++++++++--------------- config/02-ce-lsf-defaults.conf | 21 ++++++++--- config/02-ce-lsf.conf | 33 ++++++++-------- config/02-ce-pbs-defaults.conf | 21 ++++++++--- config/02-ce-pbs.conf | 33 ++++++++-------- config/02-ce-sge-defaults.conf | 21 ++++++++--- config/02-ce-sge.conf | 33 ++++++++-------- config/02-ce-slurm-defaults.conf | 21 ++++++++--- config/02-ce-slurm.conf | 33 ++++++++-------- 14 files changed, 207 insertions(+), 154 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 038667817..cc2b433a9 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -101,7 +101,7 @@ grid_resource = strcat("condor ", ifThenElse(size("$(SCHEDD_NAME)") > 0, "$(SCHE SCHEDD_ATTRS = $(SCHEDD_ATTRS) HTCondorCEVersion grid_resource # Use the defaults generated by the condor_ce_router_defaults script. To add -# additional defaults in the old syntax, add additional lines of the form: +# additional defaults, add additional lines of the form: # # JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;] # @@ -116,10 +116,9 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) -# Disable JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default. -# These represent the old route syntax, which will be removed for -# HTCondor V24. -JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False +# Use JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default instead of +# the new-style job router transforms (HTCONDOR-243) +JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True ################################# diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index 1b6f9f5bb..10e545f60 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -51,7 +51,9 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) -# Set whether to enable the old Job Router route syntax, defaults to False +# Set the JobRouter configuration syntax, defaults to True # (i.e. JOB_ROUTER_DEFAULTS combined with JOB_ROUTER_ENTRIES). +# Set to 'False' to use the new 'JOB_ROUTER_TRANSFORM_*' and 'JOB_ROUTER_ROUTE_*' +# style configuration (requires HTCondor 8.9) # # JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index 2ccbaf88a..d6e1ebc2b 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -10,9 +10,17 @@ # Basic route for submitting to BOSCO # Use osg-configure to set BOSCO_RMS and BOSCO_ENDPOINT -JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt - TargetUniverse = 9 - GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)" -@jrt - -JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES = \ + [ \ + GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \ + TargetUniverse = 9; \ + name = "Local_BOSCO"; \ + ] diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index ff53063cc..b8b44618f 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -8,13 +8,6 @@ # Basic route for submitting to BOSCO # Use osg-configure to set BOSCO_RMS and BOSCO_ENDPOINT -JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt - TargetUniverse = 9 - GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)" -@jrt - -JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -23,15 +16,21 @@ JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES = \ + [ \ + GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \ + TargetUniverse = 9; \ + name = "Local_BOSCO"; \ + ] + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES = \ -# [ \ -# GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \ -# TargetUniverse = 9; \ -# name = "Local_BOSCO"; \ -# ] +# JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt +# TargetUniverse = 9 +# GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)" +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_BOSCO +# JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index 8617e7c1e..0061475e4 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -10,11 +10,20 @@ ############################################################################### # Submit the job to the site Condor -JOB_ROUTER_ROUTE_Condor_Pool @=jrt - TargetUniverse = 5 -@jrt - -JOB_ROUTER_ROUTE_NAMES = Condor_Pool +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES @=jre +[ + TargetUniverse = 5; + name = "Local_Condor"; +] +@jre JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index 6b5287c69..bba1d9609 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -8,26 +8,6 @@ ############################################################################### # Submit the job to the site Condor -JOB_ROUTER_ROUTE_Condor_Pool @=jrt - TargetUniverse = 5 -@jrt - -JOB_ROUTER_ROUTE_NAMES = Condor_Pool - -# Uncomment the following line to make use of the UID to HTCondor -# accounting group mapfile (/etc/condor-ce/uid_acct_group.map) -# -# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) UidAcctGroup - -# Uncomment the following line to make use of the X.509 to HTCondor -# accounting group mapfile (/etc/condor-ce/x509_acct_group.map) -# -# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) x509AcctGroup - -JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool -JOB_ROUTER_SCHEDD2_NAME=$(FULL_HOSTNAME) -JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618 - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -36,15 +16,39 @@ JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES @=jre +[ + TargetUniverse = 5; + name = "Local_Condor"; +] +@jre + + +JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool +JOB_ROUTER_SCHEDD2_NAME=$(FULL_HOSTNAME) +JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618 + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES @=jre -# [ -# TargetUniverse = 5; -# name = "Local_Condor"; -# ] -# @jre +# JOB_ROUTER_ROUTE_Condor_Pool @=jrt +# TargetUniverse = 5 +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_Condor +# JOB_ROUTER_ROUTE_NAMES = Condor_Pool + + +# If using the new-style JobRouter configuration above, uncomment the following +# line to make use of the UID to HTCondor accounting group mapfile +# (/etc/condor-ce/uid_acct_group.map) +# +# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) UidAcctGroup + + +# If using the new-style JobRouter configuration above, uncomment the following +# line to make use of the X.509 to HTCondor accounting group mapfile +# (/etc/condor-ce/x509_acct_group.map) +# +# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) x509AcctGroup diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index 6b379289f..341aad049 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -9,9 +9,18 @@ ############################################################################### # Basic route for submitting to LSF -JOB_ROUTER_ROUTE_LSF_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch lsf" -@jrt - -JOB_ROUTER_ROUTE_NAMES = LSF_Cluster +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch lsf"; + TargetUniverse = 9; + name = "Local_LSF"; +] +@jre diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index 41cecc57f..d0befe6e3 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -7,13 +7,6 @@ ############################################################################### # Basic route for submitting to LSF -JOB_ROUTER_ROUTE_LSF_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch lsf" -@jrt - -JOB_ROUTER_ROUTE_NAMES = LSF_Cluster - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -22,16 +15,22 @@ JOB_ROUTER_ROUTE_NAMES = LSF_Cluster # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch lsf"; + TargetUniverse = 9; + name = "Local_LSF"; +] +@jre + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES @=jre -# [ -# GridResource = "batch lsf"; -# TargetUniverse = 9; -# name = "Local_LSF"; -# ] -# @jre +# JOB_ROUTER_ROUTE_LSF_Cluster @=jrt +# TargetUniverse = 9 +# GridResource = "batch lsf" +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_LSF +# JOB_ROUTER_ROUTE_NAMES = LSF_Cluster diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index 162b98ce7..0048075eb 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -9,9 +9,18 @@ ############################################################################### # Basic route for submitting to PBS -JOB_ROUTER_ROUTE_PBS_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch pbs" -@jrt - -JOB_ROUTER_ROUTE_NAMES = PBS_Cluster +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch pbs"; + TargetUniverse = 9; + name = "Local_PBS"; +] +@jre diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index bc88af4c1..f7be72fa7 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -7,13 +7,6 @@ ############################################################################### # Basic route for submitting to PBS -JOB_ROUTER_ROUTE_PBS_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch pbs" -@jrt - -JOB_ROUTER_ROUTE_NAMES = PBS_Cluster - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -22,16 +15,22 @@ JOB_ROUTER_ROUTE_NAMES = PBS_Cluster # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch pbs"; + TargetUniverse = 9; + name = "Local_PBS"; +] +@jre + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES @=jre -# [ -# GridResource = "batch pbs"; -# TargetUniverse = 9; -# name = "Local_PBS"; -# ] -# @jre +# JOB_ROUTER_ROUTE_PBS_Cluster @=jrt +# TargetUniverse = 9 +# GridResource = "batch pbs" +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_PBS +# JOB_ROUTER_ROUTE_NAMES = PBS_Cluster diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index fa8f29850..dbd1b0327 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -9,9 +9,18 @@ ############################################################################### # Basic route for submitting to SGE -JOB_ROUTER_ROUTE_SGE_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch sge" -@jrt - -JOB_ROUTER_ROUTE_NAMES = SGE_Cluster +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch sge"; + TargetUniverse = 9; + name = "Local_SGE"; +] +@jre diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index 4ca2a7548..03ca83c7f 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -7,13 +7,6 @@ ############################################################################### # Basic route for submitting to SGE -JOB_ROUTER_ROUTE_SGE_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch sge" -@jrt - -JOB_ROUTER_ROUTE_NAMES = SGE_Cluster - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -22,16 +15,22 @@ JOB_ROUTER_ROUTE_NAMES = SGE_Cluster # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch sge"; + TargetUniverse = 9; + name = "Local_SGE"; +] +@jre + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES @=jre -# [ -# GridResource = "batch sge"; -# TargetUniverse = 9; -# name = "Local_SGE"; -# ] -# @jre +# JOB_ROUTER_ROUTE_SGE_Cluster @=jrt +# TargetUniverse = 9 +# GridResource = "batch sge" +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_SGE +# JOB_ROUTER_ROUTE_NAMES = SGE_Cluster diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 9ef42859d..a6b828d26 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -9,9 +9,18 @@ ############################################################################### # Basic route for submitting to Slurm -JOB_ROUTER_ROUTE_Slurm_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch slurm" -@jrt - -JOB_ROUTER_ROUTE_NAMES = Slurm_Cluster +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and +# JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of +# the HTCondor Software Suite. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch slurm"; + TargetUniverse = 9; + name = "Local_Slurm"; +] +@jre diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index 7fd31a0e4..b8a614aee 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -7,13 +7,6 @@ ############################################################################### # Basic route for submitting to Slurm -JOB_ROUTER_ROUTE_Slurm_Cluster @=jrt - TargetUniverse = 9 - GridResource = "batch slurm" -@jrt - -JOB_ROUTER_ROUTE_NAMES = Slurm_Cluster - #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and # JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of @@ -22,16 +15,22 @@ JOB_ROUTER_ROUTE_NAMES = Slurm_Cluster # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration # Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -# Old-style job route configuration. To use this instead of -# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True" +JOB_ROUTER_ENTRIES @=jre +[ + GridResource = "batch slurm"; + TargetUniverse = 9; + name = "Local_Slurm"; +] +@jre + + +# New-style job route configuration (requires HTCondor 8.9) To use +# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False" # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following: # -# JOB_ROUTER_ENTRIES @=jre -# [ -# GridResource = "batch slurm"; -# TargetUniverse = 9; -# name = "Local_Slurm"; -# ] -# @jre +# JOB_ROUTER_ROUTE_Slurm_Cluster @=jrt +# TargetUniverse = 9 +# GridResource = "batch slurm" +# @jrt # -# JOB_ROUTER_ROUTE_NAMES = Local_Slurm +# JOB_ROUTER_ROUTE_NAMES = Slurm_Cluster