From 219a475da7e09fee69cd74f0e49fdf25cf1618b6 Mon Sep 17 00:00:00 2001 From: Cole Bollig Date: Fri, 1 Sep 2023 10:31:08 -0500 Subject: [PATCH] HTCONDOR-1968: Minor re-wording, example link, and python syntax improvements --- config/01-ce-router-defaults.conf | 2 +- config/01-ce-router.conf | 2 +- config/02-ce-bosco-defaults.conf | 2 +- config/02-ce-bosco.conf | 2 +- config/02-ce-condor-defaults.conf | 2 +- config/02-ce-condor.conf | 2 +- config/02-ce-lsf-defaults.conf | 2 +- config/02-ce-lsf.conf | 2 +- config/02-ce-pbs-defaults.conf | 2 +- config/02-ce-pbs.conf | 2 +- config/02-ce-sge-defaults.conf | 2 +- config/02-ce-sge.conf | 2 +- config/02-ce-slurm-defaults.conf | 2 +- config/02-ce-slurm.conf | 2 +- .../puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf | 2 +- src/verify_ce_config.py | 8 ++++---- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 803d8e6b6..c21905fb0 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -109,7 +109,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index ab17cf199..10e545f60 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -43,7 +43,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index e5cf49cfb..d6e1ebc2b 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -13,7 +13,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index 10f182377..b8b44618f 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index 930943eb3..0061475e4 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -13,7 +13,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index 35ddec214..bba1d9609 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index 75dcd642a..341aad049 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index 0b760ecc6..d0befe6e3 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index b75d4fa6e..0048075eb 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index d8e5b776d..f7be72fa7 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index a9049c513..dbd1b0327 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index 0f36e0fbb..03ca83c7f 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 287cf9dc7..a6b828d26 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index b08819c46..b8a614aee 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf index 6c23f6f6a..e0d25718e 100644 --- a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf +++ b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# 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. diff --git a/src/verify_ce_config.py b/src/verify_ce_config.py index 23cf5b67e..ac3b6d63d 100755 --- a/src/verify_ce_config.py +++ b/src/verify_ce_config.py @@ -83,10 +83,10 @@ def main(): if knob in htcondor.param: used_deprecated_knobs.append(knob) if len(used_deprecated_knobs) > 0: - warn("%s are deprecated and will be removed for V24 of HTCondor. New configuration" - % ", ".join(used_deprecated_knobs) - + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_." - + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n") + warn(f"{', '.join(used_deprecated_knobs)} are deprecated and will be removed for V24 of HTCondor. New configuration" + + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For example" + + " use of new syntax visit:\nhttps://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration\n\n" + + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n") for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']: try: