From cdfd66fd21fec8166fe10ea575c74e9663d7a99f Mon Sep 17 00:00:00 2001 From: ddavila0 Date: Thu, 5 Oct 2023 14:48:59 -0700 Subject: [PATCH 01/68] Update CyberaEdmonton.yaml decommissioning CYBERA-Edmonton due to lack of response --- topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml b/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml index 6831e49e2..a16679bfb 100644 --- a/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml +++ b/topology/Cybera/Cybera - Edmonton/CyberaEdmonton.yaml @@ -4,6 +4,7 @@ GroupID: 519 GroupDescription: Edmonton branch of Cybera Resources: CYBERA_EDMONTON: + Active: false ID: 1032 Description: Cybera Edmonton CE ContactLists: From 2be09f7531c28c6be10a5c82ad191d541bd34279 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 30 Apr 2024 19:48:57 -0500 Subject: [PATCH 02/68] Add topology checkouts to root's git "safe.directory" list Current versions of git bail out if the git repo is not owned by the current user (even for read-only ops). Allow root to look at the checkouts even though they're owned by apache. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d7ce9532f..5d4f93dcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,9 @@ RUN pip3 install --no-cache-dir -r requirements-apache.txt # Create data directory, and gather SSH keys for git RUN mkdir /data && \ chown -v apache:apache /data && \ - ssh-keyscan github.com bitbucket.org >> /etc/ssh/ssh_known_hosts + ssh-keyscan github.com bitbucket.org >> /etc/ssh/ssh_known_hosts && \ + git config --global --add safe.directory /data/app/topology && \ + git config --global --add safe.directory /data/app/contact # Add fetch-crl cronjob # Add daily restart of httpd to load renewed certificates From ebb51dd55a9b88f1d2bfb18ed33d6e494931f751 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:27:39 -0500 Subject: [PATCH 03/68] Create Purdue_Sharma.yaml --- projects/Purdue_Sharma.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/Purdue_Sharma.yaml diff --git a/projects/Purdue_Sharma.yaml b/projects/Purdue_Sharma.yaml new file mode 100644 index 000000000..f4800a9c1 --- /dev/null +++ b/projects/Purdue_Sharma.yaml @@ -0,0 +1,9 @@ +Department: Department of Chemistry and Biochemistry +Description: 'Investigating protein-protein interactions related to the human immune + system. Other projects include immune protein-drug interactions. We mainly use molecular + dynamics simulations and molecular coking methodologies for our study. ' +FieldOfScience: Chemistry +FieldOfScienceID: '40.0511' +InstitutionID: Unknown +Organization: Purdue University Fort Wayne +PIName: Arjun Sharma From 8e02e6f973189c4069ae07366ab19f15ac76535d Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:35:15 -0500 Subject: [PATCH 04/68] Create UMontana_Hansen.yaml --- projects/UMontana_Hansen.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/UMontana_Hansen.yaml diff --git a/projects/UMontana_Hansen.yaml b/projects/UMontana_Hansen.yaml new file mode 100644 index 000000000..69622abc3 --- /dev/null +++ b/projects/UMontana_Hansen.yaml @@ -0,0 +1,9 @@ +Department: Division of Biological Sciences +Description: Study the structure, function, and pharmacology of ligand-gated ion channels. + We are interested in running virtual screenings to identify novel ligands with therapeutic + potential in brain disorders. Se more at https://hansen-neurolab.com/ +FieldOfScience: Biological and Biomedical Sciences +FieldOfScienceID: '26.9999' +InstitutionID: https://osg-htc.org/iid/sdmbw89obfoi +Organization: University of Montana +PIName: Kasper Hansen From 0a5e771a7d44e2448dd0d5d08837317bd965e280 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 30 Apr 2024 23:39:42 -0500 Subject: [PATCH 05/68] Create CUBoulder_Piper.yaml --- projects/CUBoulder_Piper.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 projects/CUBoulder_Piper.yaml diff --git a/projects/CUBoulder_Piper.yaml b/projects/CUBoulder_Piper.yaml new file mode 100644 index 000000000..184445a13 --- /dev/null +++ b/projects/CUBoulder_Piper.yaml @@ -0,0 +1,10 @@ +Department: INSTAAR +Description: My role is to expose the community of scientists at CSDMS (https://csdms.colorado.edu) + to high-throughput computing. I plan to make a series of demonstration cases, run + them through OSG, and write up my experiences to highlight how HTC could be useful + for research in this community. +FieldOfScience: Earth Sciences +FieldOfScienceID: 40.0601b +InstitutionID: https://osg-htc.org/iid/gpeckuwpdnrs +Organization: University of Colorado Boulder +PIName: Mark Piper From 852ee421ef7fb099cc7528a6e89e61da0765f6c3 Mon Sep 17 00:00:00 2001 From: Duncan Macleod Date: Wed, 1 May 2024 11:11:16 +0100 Subject: [PATCH 06/68] add downtime for Cardiff scheduled power outage --- .../CardiffPRPCachingInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml index cb1404d6b..dfb2bc2cb 100644 --- a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml +++ b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml @@ -53,3 +53,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1794218483 + Description: 'Scheduled power outage' + Severity: Outage + StartTime: May 01, 2024 12:00 +0100 + EndTime: May 02, 2024 17:00 +0000 + CreatedTime: May 01, 2024 11:09 +0100 + ResourceName: CARDIFF_UK_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 1257fccfe78b08e37c4df525d5a906b11dc68fb8 Mon Sep 17 00:00:00 2001 From: wenjing wu <44483146+wuwj6269@users.noreply.github.com> Date: Wed, 1 May 2024 11:24:20 -0400 Subject: [PATCH 07/68] end downtime earlier --- .../AGLT2/AGLT2_downtime.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml index efd3c2a72..6a6107776 100644 --- a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml +++ b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml @@ -1326,7 +1326,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:05 +0000 ResourceName: AGLT2_SL7 Services: @@ -1337,7 +1337,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:06 +0000 ResourceName: AGLT2_CE_2 Services: @@ -1348,7 +1348,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:07 +0000 ResourceName: AGLT2_CE_3 Services: @@ -1359,7 +1359,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:07 +0000 ResourceName: AGLT2_CE_4 Services: @@ -1370,7 +1370,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:07 +0000 ResourceName: AGLT2_XRootD_door Services: @@ -1381,7 +1381,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:08 +0000 ResourceName: AGLT2_SE Services: @@ -1392,7 +1392,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:08 +0000 ResourceName: AGLT2-squid-2 Services: @@ -1403,7 +1403,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:09 +0000 ResourceName: AGLT2-squid-3 Services: @@ -1414,7 +1414,7 @@ Description: UPS repair work Severity: Outage StartTime: May 01, 2024 12:00 +0000 - EndTime: May 01, 2024 23:00 +0000 + EndTime: May 01, 2024 15:20 +0000 CreatedTime: Apr 25, 2024 21:09 +0000 ResourceName: AGLT2-squid-4 Services: From 13f234b0f8294d1295bbcd1eaf4811c559a66c6a Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 1 May 2024 10:56:28 -0500 Subject: [PATCH 08/68] Rename Purdue_Sharma.yaml to PFW_Sharma.yaml --- projects/{Purdue_Sharma.yaml => PFW_Sharma.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename projects/{Purdue_Sharma.yaml => PFW_Sharma.yaml} (100%) diff --git a/projects/Purdue_Sharma.yaml b/projects/PFW_Sharma.yaml similarity index 100% rename from projects/Purdue_Sharma.yaml rename to projects/PFW_Sharma.yaml From acb04fff69f738362d62f59877fc760b4a062d33 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Wed, 1 May 2024 11:20:23 -0500 Subject: [PATCH 09/68] Add InstitutionID to projects/PFW_Sharma.yaml --- projects/PFW_Sharma.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/PFW_Sharma.yaml b/projects/PFW_Sharma.yaml index f4800a9c1..9fcb1458a 100644 --- a/projects/PFW_Sharma.yaml +++ b/projects/PFW_Sharma.yaml @@ -4,6 +4,6 @@ Description: 'Investigating protein-protein interactions related to the human im dynamics simulations and molecular coking methodologies for our study. ' FieldOfScience: Chemistry FieldOfScienceID: '40.0511' -InstitutionID: Unknown +InstitutionID: 'https://osg-htc.org/iid/dgsgv9qbvgce' Organization: Purdue University Fort Wayne PIName: Arjun Sharma From 60a0d993e7160b6e50e1b1a629c089d14cec9ff5 Mon Sep 17 00:00:00 2001 From: Jeff Dost Date: Wed, 1 May 2024 10:33:43 -0700 Subject: [PATCH 10/68] register new CE for UAH-Voyager --- .../FACILITY.yaml | 1 + .../UAH - CSPAR/SITE.yaml | 7 ++++++ .../UAH - CSPAR/UAH-Voyager.yaml | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 topology/University of Alabama in Huntsville/FACILITY.yaml create mode 100644 topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml create mode 100644 topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml diff --git a/topology/University of Alabama in Huntsville/FACILITY.yaml b/topology/University of Alabama in Huntsville/FACILITY.yaml new file mode 100644 index 000000000..c6eea5eb0 --- /dev/null +++ b/topology/University of Alabama in Huntsville/FACILITY.yaml @@ -0,0 +1 @@ +ID: 10217 diff --git a/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml b/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml new file mode 100644 index 000000000..c4939e69b --- /dev/null +++ b/topology/University of Alabama in Huntsville/UAH - CSPAR/SITE.yaml @@ -0,0 +1,7 @@ +AddressLine1: 301 Sparkman Drive +Country: United States +Description: University of Alabama in Huntsville +Latitude: 34.72525 +Longitude: -86.64045 +State: Alabama +Zipcode: '35899' diff --git a/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml new file mode 100644 index 000000000..c5e03d56c --- /dev/null +++ b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml @@ -0,0 +1,25 @@ +Production: true +SupportCenter: Self Supported + +GroupDescription: The University of Alabama in Huntsville + +Resources: + UAH-Voyager-CE1: + Active: false + Description: Hosted CE serving UAH + ContactLists: + Administrative Contact: + Primary: + Name: Jeffrey Michael Dost + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Security Contact: + Primary: + Name: Jeffrey Michael Dost + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + + FQDN: uah-voyager-ce1.svc.opensciencegrid.org + Services: + CE: + Description: Hosted CE + Tags: + - CC* From 0a38662f74f147e1d031246ba313133b7d36aa18 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 1 May 2024 13:53:00 -0500 Subject: [PATCH 11/68] Add Duncan MacLeod as a site contact for Cardiff resources --- .../CardiffPRPCachingInfrastructure.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml index 857cc3811..20979b49e 100644 --- a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml +++ b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure.yaml @@ -17,6 +17,10 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 + Site Contact: + Primary: + Name: Duncan MacLeod + ID: OSG1000688 FQDN: stashcache.gravity.cf.ac.uk DN: /C=UK/O=eScience/OU=Cardiff/L=WeSC/CN=stashcache.gravity.cf.ac.uk Services: @@ -38,6 +42,10 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 + Site Contact: + Primary: + Name: Duncan MacLeod + ID: OSG1000688 FQDN: cf-ac-uk-cache.nationalresearchplatform.org DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, San Diego/CN=cf-ac-uk-cache.nationalresearchplatform.org Services: From d91707c15b26665b1e03e380a9b924a6aa1367e2 Mon Sep 17 00:00:00 2001 From: William Swanson Date: Wed, 1 May 2024 14:09:12 -0500 Subject: [PATCH 12/68] Move CHTC ITB osdf pelican origin to osdf-dev namespace --- topology/University of Wisconsin/CHTC/CHTC-ITB.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml index cc1a8b17f..a7af50742 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml @@ -403,14 +403,14 @@ Resources: Tertiary: ID: OSG1000003 Name: Brian Lin - FQDN: itb-osdf-pelican-origin.osgdev.chtc.io - DN: /CN=itb-osdf-pelican-origin.osgdev.chtc.io + FQDN: itb-osdf-pelican-origin.osdf-dev.chtc.io + DN: /CN=itb-osdf-pelican-origin.osdf-dev.chtc.io Services: XRootD origin server: Description: ITB OSDF Pelican Origin Details: - endpoint_override: itb-osdf-pelican-origin.osgdev.chtc.io:8443 - auth_endpoint_override: itb-osdf-pelican-origin.osgdev.chtc.io:8443 + endpoint_override: itb-osdf-pelican-origin.osdf-dev.chtc.io:8443 + auth_endpoint_override: itb-osdf-pelican-origin.osdf-dev.chtc.io:8443 AllowedVOs: - GLOW From 1198d1a6517062c5f587d2b8cb8754cb78487d52 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 1 May 2024 14:11:56 -0500 Subject: [PATCH 13/68] Add PWF -> Purdue University Fort Wayne mapping (used in #3846) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index 8a4f65dfe..ff97e1dee 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -58,6 +58,7 @@ OHSU: "Oregon Health & Science University" OSU: "The Ohio State University" Pitt: "University of Pittsburgh" PortlandState: "Portland State University" +PFW: "Purdue University Fort Wayne" PSI: "Planetary Science Institute" PSU: "Pennsylvania State University" Repertoire: "Repertoire Immune Medicines" From 37b8aad18acd84c5df4957223999d462e4832c9e Mon Sep 17 00:00:00 2001 From: Jeff Dost Date: Wed, 1 May 2024 14:19:00 -0700 Subject: [PATCH 14/68] also enable UAH --- .../UAH - CSPAR/UAH-Voyager.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml index c5e03d56c..a95308190 100644 --- a/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml +++ b/topology/University of Alabama in Huntsville/UAH - CSPAR/UAH-Voyager.yaml @@ -5,7 +5,7 @@ GroupDescription: The University of Alabama in Huntsville Resources: UAH-Voyager-CE1: - Active: false + Active: true Description: Hosted CE serving UAH ContactLists: Administrative Contact: From 970e883854c45f1b34cdd2fb6e53229f88a7b168 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Thu, 2 May 2024 13:24:06 -0500 Subject: [PATCH 15/68] Create NCAR_Schuster.yaml --- projects/NCAR_Schuster.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/NCAR_Schuster.yaml diff --git a/projects/NCAR_Schuster.yaml b/projects/NCAR_Schuster.yaml new file mode 100644 index 000000000..48ef4b028 --- /dev/null +++ b/projects/NCAR_Schuster.yaml @@ -0,0 +1,9 @@ +Department: Computational and Information System Lab +Description: "We plan to test the capabilities of the OSPool\r\nto run climate science\ + \ research related data analytics workflows using\r\ndatasets made accessible through\ + \ NSF NCAR's integration with the Open\r\nScience Data Federation." +FieldOfScience: Atmospheric Sciences +FieldOfScienceID: '40.0401' +InstitutionID: https://osg-htc.org/iid/hfo8pge14iwg +Organization: National Center for Atmospheric Research +PIName: Douglas Schuster From 5fdeed2d85ae52abd71a039b965046ae91c7e220 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 2 May 2024 17:16:24 -0500 Subject: [PATCH 16/68] Update projects/NCAR_Schuster.yaml --- projects/NCAR_Schuster.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/NCAR_Schuster.yaml b/projects/NCAR_Schuster.yaml index 48ef4b028..53eefc0e1 100644 --- a/projects/NCAR_Schuster.yaml +++ b/projects/NCAR_Schuster.yaml @@ -1,7 +1,8 @@ Department: Computational and Information System Lab -Description: "We plan to test the capabilities of the OSPool\r\nto run climate science\ - \ research related data analytics workflows using\r\ndatasets made accessible through\ - \ NSF NCAR's integration with the Open\r\nScience Data Federation." +Description: >- + We plan to test the capabilities of the OSPool to run climate science + research related data analytics workflows using datasets made accessible through + NSF NCAR's integration with the Open Science Data Federation. FieldOfScience: Atmospheric Sciences FieldOfScienceID: '40.0401' InstitutionID: https://osg-htc.org/iid/hfo8pge14iwg From 7bcbb986c21e7b8e90dab894920e12aed39f9e44 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 3 May 2024 10:02:58 -0500 Subject: [PATCH 17/68] Fix newlines in project descriptions form We don't want Windows newlines (\r\n) to appear in our yamls. --- src/webapp/common.py | 12 ++++++++++++ src/webapp/forms.py | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/webapp/common.py b/src/webapp/common.py index cd85ca3d8..40f648f82 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -222,6 +222,18 @@ def trim_space(s: str) -> str: ret = re.sub(r"(?m)^[ \t]+", "", ret) return ret + +def fix_newlines(in_str): + """Replace Windows newlines with Unix newlines in a string; + other CR characters are replaced with a space""" + if isinstance(in_str, str): + return in_str.replace("\r\n", "\n").replace("\r", " ") + elif isinstance(in_str, bytes): + return in_str.replace(b"\r\n", b"\n").replace(b"\r", b" ") + else: + return in_str + + def run_git_cmd(cmd: List, dir=None, git_dir=None, ssh_key=None) -> bool: """ Run git command, optionally specifying ssh key and/or git dirs diff --git a/src/webapp/forms.py b/src/webapp/forms.py index c2cb96282..e1904c86e 100644 --- a/src/webapp/forms.py +++ b/src/webapp/forms.py @@ -8,6 +8,7 @@ TextAreaField, SubmitField, TimeField, DateField from wtforms.validators import InputRequired, ValidationError +from .common import fix_newlines from . import models UTCOFFSET_CHOICES = [ @@ -349,7 +350,7 @@ def __init__(self, *args, **kwargs): self.pi_institution.data = kwargs.get("pi_institution", self.pi_institution.data) self.field_of_science.data = kwargs.get("field_of_science", self.field_of_science.data) self.field_of_science_id.data = kwargs.get("field_of_science_id", self.field_of_science_id.data) - self.description.data = kwargs.get("description", self.description.data) + self.description.data = fix_newlines(kwargs.get("description", self.description.data)) self.infos = "" From fd22f649dcee0e73296fda8b861dd1fd35a4ebc3 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 3 May 2024 10:25:05 -0500 Subject: [PATCH 18/68] Remove some other text issues: - whitespace surrounding a newline - leading and trailing whitespace --- src/webapp/common.py | 9 ++------- src/webapp/forms.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/webapp/common.py b/src/webapp/common.py index 40f648f82..da238cfae 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -223,15 +223,10 @@ def trim_space(s: str) -> str: return ret -def fix_newlines(in_str): +def fix_newlines(in_str: str) -> str: """Replace Windows newlines with Unix newlines in a string; other CR characters are replaced with a space""" - if isinstance(in_str, str): - return in_str.replace("\r\n", "\n").replace("\r", " ") - elif isinstance(in_str, bytes): - return in_str.replace(b"\r\n", b"\n").replace(b"\r", b" ") - else: - return in_str + return in_str.replace("\r\n", "\n").replace("\r", " ") def run_git_cmd(cmd: List, dir=None, git_dir=None, ssh_key=None) -> bool: diff --git a/src/webapp/forms.py b/src/webapp/forms.py index e1904c86e..b6a7d60f6 100644 --- a/src/webapp/forms.py +++ b/src/webapp/forms.py @@ -8,7 +8,7 @@ TextAreaField, SubmitField, TimeField, DateField from wtforms.validators import InputRequired, ValidationError -from .common import fix_newlines +from .common import fix_newlines, trim_space from . import models UTCOFFSET_CHOICES = [ @@ -350,7 +350,14 @@ def __init__(self, *args, **kwargs): self.pi_institution.data = kwargs.get("pi_institution", self.pi_institution.data) self.field_of_science.data = kwargs.get("field_of_science", self.field_of_science.data) self.field_of_science_id.data = kwargs.get("field_of_science_id", self.field_of_science_id.data) - self.description.data = fix_newlines(kwargs.get("description", self.description.data)) + self.description.data = kwargs.get("description", self.description.data) + try: + self.description.data = trim_space( + fix_newlines( + self.description.data.strip()) + ) + except (TypeError, AttributeError): + pass self.infos = "" From 8e9c1c8579dad46b0931baf8dd0cc2296c4ba6de Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 3 May 2024 09:44:16 -0700 Subject: [PATCH 19/68] adding endpoint and auth_endpoint #toPelican adding endpoint and auth_endpoint #toPelican --- topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml index fef5e0dff..f8b67752e 100644 --- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml +++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure.yaml @@ -21,5 +21,8 @@ Resources: Services: XRootD cache server: Description: Internet2 Denver Cache + Details: + endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443 + auth_endpoint_override: dtn-pas.denv.nrp.internet2.edu:8443 AllowedVOs: - ANY From b6376a505eda184c89eafbb26e8de27801bd9737 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Mon, 6 May 2024 16:22:35 -0500 Subject: [PATCH 20/68] Upgrade Werkzeug to 3.0.3+ --- requirements-rootless.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-rootless.txt b/requirements-rootless.txt index 1dea7c264..7fbb8aa7a 100644 --- a/requirements-rootless.txt +++ b/requirements-rootless.txt @@ -28,6 +28,6 @@ requests~=2.31.0 six~=1.16.0 smmap~=5.0.0 urllib3~=2.0.2 -Werkzeug~=2.3.4 +Werkzeug~=3.0.3 WTForms~=3.0.1 xmltodict~=0.13.0 From e8bc1c33781a3d50ac4f1c932449e16faf44e8ca Mon Sep 17 00:00:00 2001 From: Christina K Date: Mon, 6 May 2024 16:59:08 -0500 Subject: [PATCH 21/68] Create PSU_Lynch.yaml --- projects/PSU_Lynch.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 projects/PSU_Lynch.yaml diff --git a/projects/PSU_Lynch.yaml b/projects/PSU_Lynch.yaml new file mode 100644 index 000000000..4319511ad --- /dev/null +++ b/projects/PSU_Lynch.yaml @@ -0,0 +1,17 @@ +Department: Plant Science +Description: "OpenSimRoot is an open-source, 3D functional\u2013structural plant model\ + \ that simulates root system architecture 3 dimensionally, accounting for interactions\ + \ between soil physical properties, root growth and associated metabolic costs thus\ + \ enabling study of the value of root traits for resource acquisition and plant\ + \ growth. As a research tool it supports experimental designs and mechanistic understanding\ + \ of underlying processes. We aim to understand plant\u2013soil interactions in\ + \ a wide range of soil taxa, especially with respect to degraded soils in developing\ + \ countries, in order to address the knowledge gap that is critical for global food\ + \ security. https://plantscience.psu.edu/research/labs/roots/methods/computer-analysis-tools\ + \ https://plantscience.psu.edu/research/labs/roots/publications/overviews/opensimroot-widening-the-scope-and-application-of-root-architectural-models\ + \ https://rootmodels.gitlab.io/ " +FieldOfScience: Plant Biology +FieldOfScienceID: '01.1101' +InstitutionID: https://osg-htc.org/iid/f1tlj6c19ppg +Organization: Pennsylvania State University +PIName: Jonathan Lynch From 8bc5cbc0f598033d79d7e2c7f0cd6e4be54777c1 Mon Sep 17 00:00:00 2001 From: Christina K Date: Mon, 6 May 2024 17:04:02 -0500 Subject: [PATCH 22/68] Create IGWN_Staff.yaml --- projects/IGWN_Staff.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 projects/IGWN_Staff.yaml diff --git a/projects/IGWN_Staff.yaml b/projects/IGWN_Staff.yaml new file mode 100644 index 000000000..37e0af506 --- /dev/null +++ b/projects/IGWN_Staff.yaml @@ -0,0 +1,7 @@ +Department: Physics +Description: IGWN staff. Set up quickly for James and Peter's visit to CHTC on 2024-02-21 +FieldOfScience: Gravitational Physics +FieldOfScienceID: '40.0202' +InstitutionID: https://osg-htc.org/iid/uvf22j6xjbtv +Organization: Georgia Institute of Technology +PIName: James Clark From a3b196053d300e98446757257c21ae07d87b7446 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 6 May 2024 17:04:45 -0500 Subject: [PATCH 23/68] Update projects/IGWN_Staff.yaml --- projects/IGWN_Staff.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/IGWN_Staff.yaml b/projects/IGWN_Staff.yaml index 37e0af506..30bea14b4 100644 --- a/projects/IGWN_Staff.yaml +++ b/projects/IGWN_Staff.yaml @@ -1,5 +1,5 @@ Department: Physics -Description: IGWN staff. Set up quickly for James and Peter's visit to CHTC on 2024-02-21 +Description: IGWN staff FieldOfScience: Gravitational Physics FieldOfScienceID: '40.0202' InstitutionID: https://osg-htc.org/iid/uvf22j6xjbtv From 356deb35be9a2d315bdd45914923e5ff8922ee95 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 6 May 2024 15:22:53 -0700 Subject: [PATCH 24/68] Add downtime for Stashcache-Chicago due to Hardware issues RAID problem Add downtime for Stashcache-Chicago due to Hardware issues RAID problem --- .../I2ChicagoInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml index 4bbac9456..30bf616a9 100644 --- a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure_downtime.yaml @@ -20,3 +20,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800341180 + Description: Hardware issues RAID problem + Severity: Outage + StartTime: May 06, 2024 19:30 +0000 + EndTime: May 10, 2024 19:30 +0000 + CreatedTime: May 06, 2024 22:21 +0000 + ResourceName: Stashcache-Chicago + Services: + - XRootD cache server +# --------------------------------------------------------- From 66b3924d126749fc34f56446ec2e15715de351d8 Mon Sep 17 00:00:00 2001 From: Eric Coulter Date: Tue, 7 May 2024 10:44:05 -0400 Subject: [PATCH 25/68] Downtime for Georgia Tech PACE OSG 2 due to Site Maintenance Meant to schedule this ahead of time... --- .../Georgia Tech PACE OSG 2_downtime.yaml | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml index 633d15c7c..fac08e0e8 100644 --- a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml +++ b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml @@ -763,3 +763,83 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928693 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_LIGO_Submit_2 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928694 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_CE_2 + Services: + - CE + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928695 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_CE_ICECUBE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928696 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_CE_LIGO + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928697 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_CE_OSG + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928698 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_GridFTP2 + Services: + - GridFtp + - XRootD cache server +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1800928699 + Description: Site Wide Maintenance + Severity: Outage + StartTime: May 07, 2024 10:00 +0000 + EndTime: May 11, 2024 03:59 +0000 + CreatedTime: May 07, 2024 14:41 +0000 + ResourceName: Georgia_Tech_PACE_perfSONAR_BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- + From 123c98302c4ec4619ca53932a441bfb316eb7985 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 7 May 2024 11:12:32 -0700 Subject: [PATCH 26/68] Changing S3 port to 8444 --- .../San Diego Supercomputer Center/SDSC-NRP.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml index d41d79203..44395146e 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml @@ -72,8 +72,8 @@ Resources: XRootD origin server: Description: SDSC NRP OSDF Origin Details: - endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:50123 - auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:50123 + endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 + auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 AllowedVOs: - ANY SDSC_NRP_FDP_OSDF_CACHE: From a29da3c671a70ec6b9f9cb324a25fb3dcf9d9f1a Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 7 May 2024 11:36:42 -0700 Subject: [PATCH 27/68] Add downtime for NCAR_OSDF_ORIGIN due to Firewall issues Add downtime for NCAR_OSDF_ORIGIN due to Firewall issues --- .../NCAR-OSDF_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml new file mode 100644 index 000000000..3188d26fd --- /dev/null +++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1801069641 + Description: Firewall issues + Severity: Outage + StartTime: May 07, 2024 19:30 +0000 + EndTime: May 31, 2024 19:30 +0000 + CreatedTime: May 07, 2024 18:36 +0000 + ResourceName: NCAR_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- From c2b02dbf11cfda0481765a655c6d8fea2be2374e Mon Sep 17 00:00:00 2001 From: orind <49697742+orind@users.noreply.github.com> Date: Tue, 7 May 2024 14:59:54 -0400 Subject: [PATCH 28/68] Update BNL-ATLAS.yaml Updated DNS name for two compute elements that are being rebuilt gridgk0[7,8].racf.bnl.gov -> gridgk0[7,8].sdcc.bnl.gov --- .../BNL ATLAS Tier1/BNL-ATLAS.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml index 3738af857..f9c061f92 100644 --- a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml +++ b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS.yaml @@ -220,14 +220,14 @@ Resources: ID: OSG1000212 Description: An OSG CE resource at BNL, mainly serving USATLAS production jobs, not open to general OSG users. - FQDN: gridgk07.racf.bnl.gov + FQDN: gridgk07.sdcc.bnl.gov ID: 438 Services: CE: Description: Compute Element Details: hidden: false - sam_uri: htcondor://gridgk07.racf.bnl.gov + sam_uri: htcondor://gridgk07.sdcc.bnl.gov VOOwnership: ATLAS: 100 WLCGInformation: @@ -261,14 +261,14 @@ Resources: ID: OSG1000212 Description: This CE will serve grid jobs submitted to the *local* USATLAS resources, e.g. for panda queue ANALY_BNL_LOCAL, at BNL. - FQDN: gridgk08.racf.bnl.gov + FQDN: gridgk08.sdcc.bnl.gov ID: 545 Services: CE: Description: Compute Element Details: hidden: false - sam_uri: htcondor://gridgk08.racf.bnl.gov + sam_uri: htcondor://gridgk08.sdcc.bnl.gov VOOwnership: ATLAS: 100 WLCGInformation: From 662c9a1360db2ad7a85036cb1c70e465ea86d7e2 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 8 May 2024 09:28:35 -0500 Subject: [PATCH 29/68] Fix hostname in SDSC NRP FDP OSDF cache --- .../San Diego Supercomputer Center/SDSC-NRP.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml index 44395146e..1180bc778 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP.yaml @@ -98,6 +98,6 @@ Resources: Description: SDSC NRP FDP OSDF cache Details: endpoint_override: fdp-cache.nationalresearchplatform.org:8443 - auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8443 + auth_endpoint_override: fdp-cache.nationalresearchplatform.org:8443 AllowedVOs: - ANY From a169d03245a94159caed1f5cdc9f497ab542b4b7 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 8 Apr 2024 18:42:19 -0500 Subject: [PATCH 30/68] First attempt at registering new AP40 Pelican origin (INF-1796) --- .../University of Wisconsin/CHTC/CHTC.yaml | 6 +++++ virtual-organizations/OSG.yaml | 22 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 63084d7a4..d7f77551c 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -526,11 +526,17 @@ Resources: - ap2007.chtc.wisc.edu - ospool-ap2040.chtc.wisc.edu - ap40.chtc.wisc.edu + - ospool-2140.chtc.wisc.edu + DN: /CN=ospool-ap2140.chtc.wisc.edu Services: Submit Node: Description: OS Pool access point Details: hidden: false + XRootD origin server: + Description: OSDF Pelican origin + Details: + hidden: false Tags: - OSPool VOOwnership: diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 94c957677..e671c280b 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -136,10 +136,11 @@ DataFederations: Map Subject: True AllowedOrigins: - CHTC_OSPOOL_ORIGIN + - CHTC-ap40 AllowedCaches: - ANY - Writeback: https://origin-auth2001.chtc.wisc.edu:1095 - DirList: https://origin-auth2001.chtc.wisc.edu:1095 + Writeback: https://ospool-ap2140.chtc.wisc.edu:8443 + DirList: https://ospool-ap2140.chtc.wisc.edu:8443 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -257,6 +258,23 @@ DataFederations: Issuer: https://osg-htc.org/ospool MaxScopeDepth: 4 + - Path: /ospool/ap40/data + Authorizations: + - SciTokens: + Issuer: https://ap40.uw.osg-htc.org:8443 + Base Path: /ospool/ap40 + Map Subject: True + AllowedOrigins: + - CHTC-ap40 + AllowedCaches: + - ANY + Writeback: https://ap40.uw.osg-htc.org:8443 + DirList: https://ap40.uw.osg-htc.org:8443 + CredentialGeneration: + Strategy: OAuth2 + Issuer: https://osg-htc.org/ospool + MaxScopeDepth: 4 + # SciTokens issuer for ap20 - Path: /ospool/ap20/.well-known Authorizations: From cb435d6773b76770f01fa7fdd4c38179ba5df6b1 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 9 Apr 2024 14:31:12 -0500 Subject: [PATCH 31/68] Make sure the issuer matches Co-authored-by: Matyas Selmeci --- virtual-organizations/OSG.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index e671c280b..457ead84f 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -272,7 +272,7 @@ DataFederations: DirList: https://ap40.uw.osg-htc.org:8443 CredentialGeneration: Strategy: OAuth2 - Issuer: https://osg-htc.org/ospool + Issuer: https://ap40.uw.osg-htc.org:8443 MaxScopeDepth: 4 # SciTokens issuer for ap20 From 380e551f49e3e148401673d75796e2d7b7e36c33 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 9 Apr 2024 14:32:19 -0500 Subject: [PATCH 32/68] Make sure to set AllowedVOs (INF-1796) --- topology/University of Wisconsin/CHTC/CHTC.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index d7f77551c..fbd2a237f 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -541,6 +541,8 @@ Resources: - OSPool VOOwnership: OSG: 100 + AllowedVOs: + - OSG CHTC-ospool-eht: Active: true From 16ae2f9cc1501ec986f94b06d0d707fde043b02a Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 7 May 2024 12:49:05 -0500 Subject: [PATCH 33/68] Avoid switching the /ospool/PROTECTED writeback until we transition --- virtual-organizations/OSG.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 457ead84f..905192cca 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -136,11 +136,10 @@ DataFederations: Map Subject: True AllowedOrigins: - CHTC_OSPOOL_ORIGIN - - CHTC-ap40 AllowedCaches: - ANY - Writeback: https://ospool-ap2140.chtc.wisc.edu:8443 - DirList: https://ospool-ap2140.chtc.wisc.edu:8443 + Writeback: https://origin-auth2001.chtc.wisc.edu:1095 + DirList: https://origin-auth2001.chtc.wisc.edu:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool From aeaebe585b985b75eab419e68bf4cd06e5eff434 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 7 May 2024 12:49:20 -0500 Subject: [PATCH 34/68] Use the A record until we transition The previous URL is the CNAME that points to ospool-ap2040.chtc.wisc.edu --- virtual-organizations/OSG.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 905192cca..b612ea1e7 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -260,18 +260,18 @@ DataFederations: - Path: /ospool/ap40/data Authorizations: - SciTokens: - Issuer: https://ap40.uw.osg-htc.org:8443 + Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 Base Path: /ospool/ap40 Map Subject: True AllowedOrigins: - CHTC-ap40 AllowedCaches: - ANY - Writeback: https://ap40.uw.osg-htc.org:8443 - DirList: https://ap40.uw.osg-htc.org:8443 + Writeback: https://ospool-ap2140.chtc.wisc.edu:8443 + DirList: https://ospool-ap2140.chtc.wisc.edu:8443 CredentialGeneration: Strategy: OAuth2 - Issuer: https://ap40.uw.osg-htc.org:8443 + Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 MaxScopeDepth: 4 # SciTokens issuer for ap20 From c50460452cdae9244107022c19aa5f151c43e0de Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 8 May 2024 11:06:38 -0500 Subject: [PATCH 35/68] Update topology/University of Wisconsin/CHTC/CHTC.yaml --- topology/University of Wisconsin/CHTC/CHTC.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index fbd2a237f..9818d27f1 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -537,6 +537,8 @@ Resources: Description: OSDF Pelican origin Details: hidden: false + endpoint_override: ospool-ap2140.chtc.wisc.edu:8443 + auth_endpoint_override: ospool-ap2140.chtc.wisc.edu:8443 Tags: - OSPool VOOwnership: From 6919819e81b953649bb08cac9448e0267cd95356 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 8 May 2024 09:45:35 -0700 Subject: [PATCH 36/68] Add downtime for SUT-STASHCACHE due to Hardware migration Add downtime for SUT-STASHCACHE due to Hardware migration --- .../SUT - OzStar/SUT-OzStar_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml diff --git a/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml b/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml new file mode 100644 index 000000000..9cd6f2b4c --- /dev/null +++ b/topology/Swinburne University of Technology/SUT - OzStar/SUT-OzStar_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1801866975 + Description: Hardware migration + Severity: Outage + StartTime: May 08, 2024 19:30 +0000 + EndTime: May 24, 2024 19:30 +0000 + CreatedTime: May 08, 2024 16:44 +0000 + ResourceName: SUT-STASHCACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 591196c07459f22e2438fcd17fbf2fa54d4f9e07 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 8 May 2024 09:47:54 -0700 Subject: [PATCH 37/68] Add downtime for DENVER_INTERNET2_OSDF_CACHE due to '#toPelican' Add downtime for DENVER_INTERNET2_OSDF_CACHE due to '#toPelican' --- .../I2DenverInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml index 0d858c7a4..be22f56bc 100644 --- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml @@ -31,3 +31,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801868080 + Description: toPelican + Severity: Outage + StartTime: May 08, 2024 19:30 +0000 + EndTime: May 24, 2024 19:30 +0000 + CreatedTime: May 08, 2024 16:46 +0000 + ResourceName: DENVER_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From c4a216561952029be7d1bcde2a68889e0281ec54 Mon Sep 17 00:00:00 2001 From: rvaladao <45594439+rvaladao@users.noreply.github.com> Date: Wed, 8 May 2024 14:40:00 -0300 Subject: [PATCH 38/68] Update UERJ_downtime.yaml We're migrating our storage and will update our workernodes to EL8 --- .../T2_BR_UERJ/UERJ_downtime.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml index 78a8c7671..c75f02d58 100644 --- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml +++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml @@ -1401,4 +1401,59 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801899214 + Description: We're migrating our storage + Severity: Outage + StartTime: May 07, 2024 17:50 +0000 + EndTime: May 27, 2024 14:00 +0000 + CreatedTime: May 08, 2024 17:38 +0000 + ResourceName: UERJ_CE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801899600 + Description: We're migrating our storage and will update our workernodes to EL8 + Severity: Outage + StartTime: May 07, 2024 17:50 +0000 + EndTime: May 27, 2024 14:00 +0000 + CreatedTime: May 08, 2024 17:39 +0000 + ResourceName: UERJ_CE_2 + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801899685 + Description: We're migrating our storage and will update our workernodes to EL8 + Severity: Outage + StartTime: May 07, 2024 17:50 +0000 + EndTime: May 27, 2024 14:00 +0000 + CreatedTime: May 08, 2024 17:39 +0000 + ResourceName: UERJ_SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801899756 + Description: We're migrating our storage and will update our workernodes to EL8 + Severity: Outage + StartTime: May 07, 2024 17:50 +0000 + EndTime: May 27, 2024 14:00 +0000 + CreatedTime: May 08, 2024 17:39 +0000 + ResourceName: UERJ_SQUID + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1801899851 + Description: We're migrating our storage and will update our workernodes to EL8 + Severity: Outage + StartTime: May 07, 2024 17:50 +0000 + EndTime: May 27, 2024 14:00 +0000 + CreatedTime: May 08, 2024 17:39 +0000 + ResourceName: UERJ_SQUID_2 + Services: + - Squid +# --------------------------------------------------------- From 29b805f8a60b5f0875807dabbc239612c851c564 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 8 May 2024 17:45:18 -0700 Subject: [PATCH 39/68] Changing downtime time Changing downtime time --- .../Internet2Denver/I2DenverInfrastructure_downtime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml index be22f56bc..539f684f0 100644 --- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml @@ -35,7 +35,7 @@ ID: 1801868080 Description: toPelican Severity: Outage - StartTime: May 08, 2024 19:30 +0000 + StartTime: May 08, 2024 00:01 +0000 EndTime: May 24, 2024 19:30 +0000 CreatedTime: May 08, 2024 16:46 +0000 ResourceName: DENVER_INTERNET2_OSDF_CACHE From 5acdbc48f9ecfcc8760b0739b7be8d497d46bca6 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 8 May 2024 17:53:17 -0700 Subject: [PATCH 40/68] Add downtime for UKI-SCOTGRID-ECDF-STASHCACHE due to offline - checking with the admin Add downtime for UKI-SCOTGRID-ECDF-STASHCACHE due to offline - checking with the admin --- .../Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml diff --git a/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml b/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml new file mode 100644 index 000000000..098cc9ba1 --- /dev/null +++ b/topology/University of Edinburgh/Scotgrid ECDF/UKI-SCOTGRID-CDF_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1802159541 + Description: offline - checking with the admin + Severity: Outage + StartTime: May 08, 2024 08:00 +0000 + EndTime: May 17, 2024 19:30 +0000 + CreatedTime: May 09, 2024 00:52 +0000 + ResourceName: UKI-SCOTGRID-ECDF-STASHCACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From f4ac2b9e8bfe1faaa5c4660d9a479ba296f323f9 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Thu, 9 May 2024 13:59:23 -0700 Subject: [PATCH 41/68] New project: SJSU_IT --- projects/SJSU_IT.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 projects/SJSU_IT.yaml diff --git a/projects/SJSU_IT.yaml b/projects/SJSU_IT.yaml new file mode 100644 index 000000000..3dbb5f5cc --- /dev/null +++ b/projects/SJSU_IT.yaml @@ -0,0 +1,10 @@ +Department: IT/HPC +Description: Our goals are to explore and learn about the OSG computing environment + so we can help and share the knowledge with SJSU researchers to enable them to utilize + OSG HPC for their research projects. +FieldOfScience: Computer and Information Services +FieldOfScienceID: '11.0101' +InstitutionID: Unknown +Organization: San Jose State University +PIName: Atul Pala + From 32a84ace7f5b92b6762d14d8a253513857a57639 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 9 May 2024 18:50:57 -0700 Subject: [PATCH 42/68] Adding scitoken issuer for fdp/gyrokinetic Adding scitoken issuer for fdp/gyrokinetic --- virtual-organizations/NRP.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/virtual-organizations/NRP.yaml b/virtual-organizations/NRP.yaml index a2f495adb..4010b14b3 100644 --- a/virtual-organizations/NRP.yaml +++ b/virtual-organizations/NRP.yaml @@ -72,6 +72,17 @@ DataFederations: - SDSC_NRP_OSDF_ORIGIN AllowedCaches: - ANY + - Path: /nrp/fdp/gyrokinetic + Authorizations: + - PUBLIC + - SciTokens: + Issuer: https://t.nationalresearchplatform.org/gyrokinetic + Base Path: /nrp/fdp/gyrokinetic/ + Map Subject: False + AllowedOrigins: + - SDSC_NRP_OSDF_ORIGIN + AllowedCaches: + - ANY - Path: /knightlab Authorizations: - PUBLIC From 1a7b60480dcddc09b7c96b1b988e29efdd3b3d10 Mon Sep 17 00:00:00 2001 From: Tony Weaver <55799947+aweaver1fandm@users.noreply.github.com> Date: Fri, 10 May 2024 08:01:42 -0400 Subject: [PATCH 43/68] Update FANDM-ITS_downtime.yaml Cluster is back on-line. We removed the osg partition, so jobs will now have to go to the nodes partition --- .../FANDM-ITS/FANDM-ITS_downtime.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml b/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml index a9eb49489..b7f21dc55 100644 --- a/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml +++ b/topology/Franklin and Marshall College/FANDM-ITS/FANDM-ITS_downtime.yaml @@ -10,3 +10,16 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1803422265 + Description: Cluster is now up after maintenance. We noted before that the partition + has changed from osg to nodes. Please resume sending jobs + Severity: No Significant Outage Expected + StartTime: May 10, 2024 08:00 +0000 + EndTime: May 10, 2024 08:00 +0000 + CreatedTime: May 10, 2024 07:57 +0000 + ResourceName: FANDM-ITS-CE1 + Services: + - CE +# --------------------------------------------------------- + From d8afb9e51d0a8e0422a9bb56c8dbf15c475b39b1 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 10 May 2024 10:05:22 -0500 Subject: [PATCH 44/68] Add Institution ID to projects/SJSU_IT.yaml --- projects/SJSU_IT.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SJSU_IT.yaml b/projects/SJSU_IT.yaml index 3dbb5f5cc..779966862 100644 --- a/projects/SJSU_IT.yaml +++ b/projects/SJSU_IT.yaml @@ -4,7 +4,7 @@ Description: Our goals are to explore and learn about the OSG computing environm OSG HPC for their research projects. FieldOfScience: Computer and Information Services FieldOfScienceID: '11.0101' -InstitutionID: Unknown +InstitutionID: https://osg-htc.org/iid/0r71ijbk5mbz Organization: San Jose State University PIName: Atul Pala From 17b250460a23ef34aa74c445edddc340ed447f87 Mon Sep 17 00:00:00 2001 From: Jadir Marra da Silva Date: Fri, 10 May 2024 13:08:28 -0300 Subject: [PATCH 45/68] Update SPRACE_downtime.yaml Please approve this downtime --- .../SPRACE/SPRACE_downtime.yaml | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml index a882e331c..50f846260 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml @@ -3258,3 +3258,80 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572631 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: BR-Sprace BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572632 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: BR-Sprace LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572633 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: SPRACE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572634 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: SPRACE-SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572635 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: SPRACE_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572636 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: T2_BR_SPRACE-squid1 + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803572637 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 16:00 +0000 + EndTime: May 10, 2024 22:00 +0000 + CreatedTime: May 10, 2024 16:07 +0000 + ResourceName: T2_BR_SPRACE-squid2 + Services: + - Squid +# --------------------------------------------------------- From da19736a50a5469edf74033db070843203689ce7 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 10 May 2024 12:07:21 -0700 Subject: [PATCH 46/68] Removing downtime - #toPelican Removing downtime - #toPelican --- .../Internet2Denver/I2DenverInfrastructure_downtime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml index 539f684f0..6a1cc3a33 100644 --- a/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Denver/I2DenverInfrastructure_downtime.yaml @@ -36,7 +36,7 @@ Description: toPelican Severity: Outage StartTime: May 08, 2024 00:01 +0000 - EndTime: May 24, 2024 19:30 +0000 + EndTime: May 10, 2024 19:30 +0000 CreatedTime: May 08, 2024 16:46 +0000 ResourceName: DENVER_INTERNET2_OSDF_CACHE Services: From 005e55d31e4d9f0411713791c7e626555223597d Mon Sep 17 00:00:00 2001 From: Jadir Marra da Silva Date: Fri, 10 May 2024 19:08:50 -0300 Subject: [PATCH 47/68] Update SPRACE_downtime.yaml Site still offline --- .../SPRACE/SPRACE_downtime.yaml | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml index 50f846260..207bd9c55 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml @@ -3335,3 +3335,80 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788879 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: BR-Sprace BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788880 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: BR-Sprace LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788881 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: SPRACE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788882 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: SPRACE-SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788883 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: SPRACE_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788884 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: T2_BR_SPRACE-squid1 + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1803788885 + Description: network outage - fiber cut + Severity: Outage + StartTime: May 10, 2024 22:07 +0000 + EndTime: May 11, 2024 15:07 +0000 + CreatedTime: May 10, 2024 22:08 +0000 + ResourceName: T2_BR_SPRACE-squid2 + Services: + - Squid +# --------------------------------------------------------- From 94028270862cbc60e50dcc7c3b21493f99b9a6fd Mon Sep 17 00:00:00 2001 From: Jadir Marra da Silva Date: Sat, 11 May 2024 08:24:05 -0300 Subject: [PATCH 48/68] Update SPRACE_downtime.yaml Removing downtime, site is back online --- .../SPRACE/SPRACE_downtime.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml index 207bd9c55..eff8c25ae 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml @@ -3340,7 +3340,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: BR-Sprace BW Services: @@ -3351,7 +3351,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: BR-Sprace LT Services: @@ -3362,7 +3362,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: SPRACE Services: @@ -3373,7 +3373,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: SPRACE-SE Services: @@ -3384,7 +3384,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: SPRACE_OSDF_CACHE Services: @@ -3395,7 +3395,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: T2_BR_SPRACE-squid1 Services: @@ -3406,7 +3406,7 @@ Description: network outage - fiber cut Severity: Outage StartTime: May 10, 2024 22:07 +0000 - EndTime: May 11, 2024 15:07 +0000 + EndTime: May 11, 2024 11:30 +0000 CreatedTime: May 10, 2024 22:08 +0000 ResourceName: T2_BR_SPRACE-squid2 Services: From 3686a6a95ef38dd6b48d712e040f4d46a735b95a Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 13 May 2024 11:01:47 -0700 Subject: [PATCH 49/68] Add downtime for MGHPCC_NRP_OSDF_CACHE due to HW issue Add downtime for MGHPCC_NRP_OSDF_CACHE due to HW issue --- .../NRP/MGHPCCCachingInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml index c40db5431..a41d58815 100644 --- a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml +++ b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure_downtime.yaml @@ -20,3 +20,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1806232660 + Description: HW issue + Severity: Outage + StartTime: May 12, 2024 19:30 +0000 + EndTime: Jul 31, 2024 19:30 +0000 + CreatedTime: May 13, 2024 18:01 +0000 + ResourceName: MGHPCC_NRP_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From b9dabd07d0f555f2bfefe4dc6aaa3e83e668ca97 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 13 May 2024 12:07:38 -0700 Subject: [PATCH 50/68] Add downtime for BOISE_INTERNET2_OSDF_CACHE due to #toPelican Add downtime for BOISE_INTERNET2_OSDF_CACHE due to #toPelican --- .../I2BoiseInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml index 4310cdc07..a10db4b36 100644 --- a/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Boise/I2BoiseInfrastructure_downtime.yaml @@ -20,3 +20,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1806272100 + Description: '#toPelican' + Severity: Outage + StartTime: May 12, 2024 19:30 +0000 + EndTime: May 18, 2024 06:59 +0000 + CreatedTime: May 13, 2024 19:06 +0000 + ResourceName: BOISE_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From e34a5a20bd16d0a8fac6d1ec549f4b604b20111f Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 14 May 2024 10:22:00 -0700 Subject: [PATCH 51/68] Add downtime for CINCINNATI_INTERNET2_OSDF_CACHE due to #toPelican Add downtime for CINCINNATI_INTERNET2_OSDF_CACHE due to #toPelican --- .../I2CincinnatiInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml diff --git a/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml new file mode 100644 index 000000000..c46c939ab --- /dev/null +++ b/topology/Internet2/Internet2Cincinnati/I2CincinnatiInfrastructure_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1807071908 + Description: '#toPelican' + Severity: Outage + StartTime: May 14, 2024 07:01 +0000 + EndTime: May 17, 2024 19:30 +0000 + CreatedTime: May 14, 2024 17:19 +0000 + ResourceName: CINCINNATI_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 656f2e34ee134c745270a4dc7a7065d73c1168d0 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Tue, 14 May 2024 16:06:21 -0500 Subject: [PATCH 52/68] Adds downtime for uw it ce due to maintenance --- .../UW-IT_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml diff --git a/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml b/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml new file mode 100644 index 000000000..29fe24a0e --- /dev/null +++ b/topology/University of Washington/University of Washington Research Computing/UW-IT_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1807207062 + Description: Maintenance + Severity: Outage + StartTime: May 14, 2024 21:04 +0000 + EndTime: May 16, 2024 04:59 +0000 + CreatedTime: May 14, 2024 21:05 +0000 + ResourceName: UW-IT-CE1 + Services: + - CE +# --------------------------------------------------------- From a7723fbcae3e91b7b9f186cc189825b2ce6c11f1 Mon Sep 17 00:00:00 2001 From: Andrew Owen <60940495+aowen-uwmad@users.noreply.github.com> Date: Tue, 14 May 2024 16:37:21 -0500 Subject: [PATCH 53/68] Create UCSD_Sfiligoi --- projects/UCSD_Sfiligoi | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/UCSD_Sfiligoi diff --git a/projects/UCSD_Sfiligoi b/projects/UCSD_Sfiligoi new file mode 100644 index 000000000..47fe36c7f --- /dev/null +++ b/projects/UCSD_Sfiligoi @@ -0,0 +1,8 @@ +Department: San Diego Supercomputer Center +Description: The mission of the Global Infrastructure Lab (GIL) is to test and evaluate + infrastructure software. This project is used to exercise the OSPool services. +FieldOfScience: Computer Science +FieldOfScienceID: '11.0501' +InstitutionID: https://osg-htc.org/iid/06wup3aye2t7 +Organization: University of California, San Diego +PIName: Igor Sfiligoi From 0347167dad32430c3575f543030fc3adee00bdab Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 15 May 2024 10:38:49 -0500 Subject: [PATCH 54/68] Retire old resources Lincoln gave the thumbs up on rccf-osg.ci-connect.net and the other one hasn't reported hours to the GRACC in quote some time --- .../Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml b/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml index d2e5d91d7..d160a580d 100644 --- a/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml +++ b/topology/Clemson University/Clemson-Palmetto/Clemson-Palmetto.yaml @@ -3,7 +3,7 @@ GroupID: 212 Production: true Resources: Clemson-Connect: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -30,7 +30,7 @@ Resources: hidden: false uri_override: osgconnect@user.palmetto.clemson.edu/pbs Clemson-Palmetto: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From fd774a8d618243e040ddd5ec10a96b8ae8f9c6f2 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 15 May 2024 11:07:22 -0500 Subject: [PATCH 55/68] Add facility and site for Riga Technical University CMS Tier-2 (FD #76435) --- topology/Riga Technical University/RTU-CMS/SITE.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 topology/Riga Technical University/RTU-CMS/SITE.yaml diff --git a/topology/Riga Technical University/RTU-CMS/SITE.yaml b/topology/Riga Technical University/RTU-CMS/SITE.yaml new file mode 100644 index 000000000..e00f816b8 --- /dev/null +++ b/topology/Riga Technical University/RTU-CMS/SITE.yaml @@ -0,0 +1,12 @@ +LongName: Riga Technical University CMS Tier-2 +Description: CMS Tier-2 site hosted by the Latvia CMS Tier-2 Federation in Riga Technical University + +AddressLine1: 6A Kipsalas Street +City: Riga +Country: Latvia +### State (optional) is the state or province the site is located in +# State: Wisconsin +Zipcode: "LV-1048" + +Latitude: 56.9539 +Longitude: 23.8959 From 96d0b90f039bce1bd93c5fbdb1913f98317cd241 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 15 May 2024 14:56:37 -0500 Subject: [PATCH 56/68] Create UW_Loverde.yaml --- projects/UW_Loverde.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 projects/UW_Loverde.yaml diff --git a/projects/UW_Loverde.yaml b/projects/UW_Loverde.yaml new file mode 100644 index 000000000..a262801c0 --- /dev/null +++ b/projects/UW_Loverde.yaml @@ -0,0 +1,12 @@ +Department: Physics +Description: "The University of Washington Dark Universe Science Center brings experts\ + \ in dark matter, dark energy, inflation, and gravity together with those who study\ + \ how these invisible ingredients drive the evolution of the Universe along with\ + \ the stars, black holes, and galaxies within it. By combining observations of the\ + \ cosmos with direct measurements of the Universe\u2019s invisible content, we hope\ + \ to fundamentally change our understanding of Nature. (https://sites.google.com/uw.edu/dusc)" +FieldOfScience: Physics +FieldOfScienceID: '40.0202' +InstitutionID: https://osg-htc.org/iid/8lpmoeouw66o +Organization: University of Washington +PIName: Marilena Loverde From 0715b52089aba262103f1fe1e3d56e6ab66287eb Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 15 May 2024 15:16:20 -0500 Subject: [PATCH 57/68] Create UNL_Yin.yaml --- projects/UNL_Yin.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 projects/UNL_Yin.yaml diff --git a/projects/UNL_Yin.yaml b/projects/UNL_Yin.yaml new file mode 100644 index 000000000..b18753597 --- /dev/null +++ b/projects/UNL_Yin.yaml @@ -0,0 +1,10 @@ +Department: Food Science and Technology +Description: "Our lab is a Bioinformatics and Computational Biology Lab. We have the\ + \ following major research interests:1. Plant and microbial bioinformatics 2. Genome\ + \ biology and evolutionary genomics\r\n3. Carbohydrate metabolism and secondary\ + \ metabolism " +FieldOfScience: Biological and Biomedical Sciences +FieldOfScienceID: '26.9999' +InstitutionID: Unknown +Organization: University of Nebraska - Lincoln +PIName: Yanbin Yin From 8da9ae8f829aa92f24f43200f4ec369cbc726abe Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 15 May 2024 15:36:04 -0500 Subject: [PATCH 58/68] Add UNL institution ID --- projects/UNL_Yin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/UNL_Yin.yaml b/projects/UNL_Yin.yaml index b18753597..cae665488 100644 --- a/projects/UNL_Yin.yaml +++ b/projects/UNL_Yin.yaml @@ -5,6 +5,6 @@ Description: "Our lab is a Bioinformatics and Computational Biology Lab. We have \ metabolism " FieldOfScience: Biological and Biomedical Sciences FieldOfScienceID: '26.9999' -InstitutionID: Unknown +InstitutionID: 'https://osg-htc.org/iid/q9k1b8dfrw25 ' Organization: University of Nebraska - Lincoln PIName: Yanbin Yin From 7704df89bb2a94f1332458012d9524eb1084b48e Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 15 May 2024 15:36:24 -0500 Subject: [PATCH 59/68] Remove extraneous space --- projects/UNL_Yin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/UNL_Yin.yaml b/projects/UNL_Yin.yaml index cae665488..713a8bae5 100644 --- a/projects/UNL_Yin.yaml +++ b/projects/UNL_Yin.yaml @@ -5,6 +5,6 @@ Description: "Our lab is a Bioinformatics and Computational Biology Lab. We have \ metabolism " FieldOfScience: Biological and Biomedical Sciences FieldOfScienceID: '26.9999' -InstitutionID: 'https://osg-htc.org/iid/q9k1b8dfrw25 ' +InstitutionID: 'https://osg-htc.org/iid/q9k1b8dfrw25' Organization: University of Nebraska - Lincoln PIName: Yanbin Yin From f183364c47a0504dd5cb750f7d0fcfa331d3ea31 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 15 May 2024 14:57:28 -0700 Subject: [PATCH 60/68] Add downtime for CARDIFF_UK_OSDF_CACHE due to overloaded Add downtime for CARDIFF_UK_OSDF_CACHE due to overloaded --- .../CardiffPRPCachingInfrastructure_downtime.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml index dfb2bc2cb..28a85b26f 100644 --- a/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml +++ b/topology/Cardiff University/Cardiff Computing Cluster/CardiffPRPCachingInfrastructure_downtime.yaml @@ -64,3 +64,15 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1808101910 + Description: overloaded + Severity: Outage + StartTime: May 14, 2024 19:30 +0000 + EndTime: May 31, 2024 19:30 +0000 + CreatedTime: May 15, 2024 21:56 +0000 + ResourceName: CARDIFF_UK_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- + From 1a5ee10d6e8c0598dfb796152b3a357c9f76779d Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 15 May 2024 15:00:23 -0700 Subject: [PATCH 61/68] Add downtime for Stashcache-UofA due to overloaded Add downtime for Stashcache-UofA due to overloaded --- .../AmsterdamPRPCachingInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml index 4aef89e59..d2680ecf2 100644 --- a/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml +++ b/topology/University of Amsterdam/AmsterdamPRP/AmsterdamPRPCachingInfrastructure_downtime.yaml @@ -64,3 +64,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1808103764 + Description: overloaded + Severity: Outage + StartTime: May 14, 2024 19:30 +0000 + EndTime: May 31, 2024 19:30 +0000 + CreatedTime: May 15, 2024 21:59 +0000 + ResourceName: Stashcache-UofA + Services: + - XRootD cache server +# --------------------------------------------------------- From 34c40e48d7188f826f6a407c13584f6a215f8f13 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 16 May 2024 11:49:00 -0700 Subject: [PATCH 62/68] Add downtime for SDSC_NRP_OSDF_CACHE due to HW issue Add downtime for SDSC_NRP_OSDF_CACHE due to HW issue --- .../SDSC-NRP_downtime.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml index 4635145ce..388d75b7b 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml @@ -42,3 +42,15 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1808852858 + Description: HW issue + Severity: Outage + StartTime: May 13, 2024 19:30 +0000 + EndTime: May 25, 2024 19:30 +0000 + CreatedTime: May 16, 2024 18:48 +0000 + ResourceName: SDSC_NRP_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- + From 85a9969ed0685726a139c14c446033d8f34e1fb5 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 16 May 2024 11:50:21 -0700 Subject: [PATCH 63/68] Add downtime for SDSC_NRP_OSDF_S3_ORIGIN due to HW issue Add downtime for SDSC_NRP_OSDF_S3_ORIGIN due to HW issue --- .../SDSC-NRP_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml index 4635145ce..bee2cfe73 100644 --- a/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml +++ b/topology/University of California San Diego/San Diego Supercomputer Center/SDSC-NRP_downtime.yaml @@ -42,3 +42,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1808853650 + Description: HW issue + Severity: Outage + StartTime: May 13, 2024 19:30 +0000 + EndTime: May 25, 2024 19:30 +0000 + CreatedTime: May 16, 2024 18:49 +0000 + ResourceName: SDSC_NRP_OSDF_S3_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- From dd3cf281468ff8357380716c898918816008cb69 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 16 May 2024 13:57:09 -0700 Subject: [PATCH 64/68] changing DN changing DN --- .../Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml index 456cf92dc..56b02345f 100644 --- a/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml +++ b/topology/Internet2/Internet2Chicago/I2ChicagoInfrastructure.yaml @@ -18,7 +18,7 @@ Resources: Name: Fabio Andrijauskas ID: OSG1000162 FQDN: osg-chicago-stashcache.nrp.internet2.edu - DN: /DC=org/DC=incommon/C=US/ST=Michigan/O=University Corporation For Advanced Internet Development/CN=osg-chicago-stashcache.nrp.internet2.edu + DN: /CN=osg-chicago-stashcache.nrp.internet2.edu Services: XRootD cache server: Description: Internet2 Chicago Cache From 0286c9a73fca615749ed95907e47b758d981cb41 Mon Sep 17 00:00:00 2001 From: Carl Vuosalo Date: Thu, 16 May 2024 16:27:13 -0500 Subject: [PATCH 65/68] Add scheduled downtime for GLOW T2_US_Wisconsin for HDFS upgrade T2_US_Wisconsin will be updating HDFS on the name nodes, which will prevent writing to /store, so we are scheduling a downtime for this upgrade. --- .../GLOW/GLOW_downtime.yaml | 209 ++++++++++++++++++ 1 file changed, 209 insertions(+) diff --git a/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml b/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml index 0a78852df..a9288377b 100644 --- a/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml +++ b/topology/University of Wisconsin/GLOW/GLOW_downtime.yaml @@ -3061,3 +3061,212 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793267 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793268 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW-CMS + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793269 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW-CMS-SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793270 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW-CONDOR-CE + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793271 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW-OSG + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793272 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SQUID + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793273 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SQUID1 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793274 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SQUID2 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793275 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SQUID3 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793276 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SQUID4 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793277 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT1 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793278 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT2 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793279 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT3 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793280 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT4 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793281 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT5 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793282 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT6 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793283 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: GLOW_SUBMIT_CERN + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793284 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: US-Wisconsin BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1808793285 + Description: Updating our Hadoop File System on our data nodes and name nodes + Severity: Severe + StartTime: May 20, 2024 13:00 +0000 + EndTime: May 20, 2024 22:00 +0000 + CreatedTime: May 16, 2024 17:08 +0000 + ResourceName: US-Wisconsin LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- From bf166b53378a34c185bf7796f181a0b7f5df28e8 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 16 May 2024 17:46:43 -0500 Subject: [PATCH 66/68] Add "production" boolean to resources in namespaces JSON (SOFTWARE-5862) --- src/stashcache.py | 12 +++++++++++- src/webapp/topology.py | 11 ++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/stashcache.py b/src/stashcache.py index 7145706e2..47eb6986d 100644 --- a/src/stashcache.py +++ b/src/stashcache.py @@ -564,7 +564,17 @@ def _service_resource_dict( if not is_null(svc, "Details", "auth_endpoint_override"): auth_endpoint = svc["Details"]["auth_endpoint_override"] break - return {"endpoint": endpoint, "auth_endpoint": auth_endpoint, "resource": r.name} + production = None + try: + production = bool(r.rg.production) + except AttributeError: + pass + return { + "endpoint": endpoint, + "auth_endpoint": auth_endpoint, + "resource": r.name, + "production": production, + } def _cache_resource_dict(r: Resource): return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=8443, unauth_port_default=8000) diff --git a/src/webapp/topology.py b/src/webapp/topology.py index e8ea800e0..bcb9b5671 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -109,7 +109,7 @@ def is_ccstar(self): return self._is_ccstar class Resource(object): - def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData): + def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData, rg: "ResourceGroup"): self.name = name self.service_types = common_data.service_types self.common_data = common_data @@ -124,6 +124,7 @@ def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData): raise ValueError(f"Resource {name} does not have an FQDN") self.fqdn = self.data["FQDN"] self.id = self.data["ID"] + self.rg = rg def get_stashcache_files(self, global_data, legacy): """Gets a resources Cache files as a dictionary""" @@ -378,14 +379,14 @@ def __init__(self, name: str, yaml_data: ParsedYaml, site: Site, common_data: Co self.support_center = OrderedDict([("ID", scid), ("Name", scname)]) self.resources_by_name = {} - for name, res in yaml_data["Resources"].items(): + for res_name, res in yaml_data["Resources"].items(): try: if not isinstance(res, dict): raise TypeError("expecting a dict") - res_obj = Resource(name, ParsedYaml(res), self.common_data) - self.resources_by_name[name] = res_obj + res_obj = Resource(res_name, ParsedYaml(res), self.common_data, rg=self) + self.resources_by_name[res_name] = res_obj except (AttributeError, KeyError, TypeError, ValueError) as err: - log.exception("Error with resource %s: %r", name, err) + log.exception("Error with resource %s: %r", res_name, err) continue self.data = yaml_data From 71bfacc8f55ecbc4d6dfef0f992480fccbcb6a0f Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 16 May 2024 17:48:57 -0500 Subject: [PATCH 67/68] Document "production" boolean (SOFTWARE-5862) --- src/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/README.md b/src/README.md index c242dca5e..01c627baa 100644 --- a/src/README.md +++ b/src/README.md @@ -522,6 +522,7 @@ Each cache in the list contains the following attributes: - `endpoint`: The `:` of the public (`xrootd@stash-cache`) service - `auth_endpoint`: The `:` of the authenticated (`xrootd@stash-cache-auth`) service - `resource`: The resource name of the cache. +- `production`: true if the resource is in "production" (as opposed to ITB) The JSON also contains an attribute `namespaces` that is a list of namespaces with the following attributes: - `path` is the path of the namespace @@ -553,11 +554,13 @@ The final result looks like { "auth_endpoint": "osg-gftp.pace.gatech.edu:8443", "endpoint": "osg-gftp.pace.gatech.edu:8000", + "production": true, "resource": "Georgia_Tech_PACE_GridFTP" }, { "auth_endpoint": "osg-gftp2.pace.gatech.edu:8443", "endpoint": "osg-gftp2.pace.gatech.edu:8000", + "production": true, "resource": "Georgia_Tech_PACE_GridFTP2" } ], @@ -567,6 +570,7 @@ The final result looks like { "auth_endpoint": "rds-cache.sdsc.edu:8443", "endpoint": "rds-cache.sdsc.edu:8000", + "production": true, "resource": "RDS_AUTH_OSDF_CACHE" } ], From 793fdb0480f9c72a8f510c22acb74a3648b6c0d5 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 17 May 2024 09:58:01 -0500 Subject: [PATCH 68/68] Fix tests (SOFTWARE-5862) - account for new argument to Resource() constructor - test new "production" boolean --- src/tests/test_api.py | 3 ++- src/tests/test_stashcache.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tests/test_api.py b/src/tests/test_api.py index c85d3eb96..a93672c9b 100644 --- a/src/tests/test_api.py +++ b/src/tests/test_api.py @@ -769,7 +769,8 @@ class TestEndpointContent: }, 'Tags': ['CC*'] } - mock_resource = Resource("AMNH-ARES", mock_resource_information, global_data.get_topology().common_data) + mock_resource = Resource("AMNH-ARES", mock_resource_information, global_data.get_topology().common_data, + mock_resource_group) mock_facility.add_site(mock_site) mock_site.add_resource_group(mock_resource_group) diff --git a/src/tests/test_stashcache.py b/src/tests/test_stashcache.py index f4573f68c..ac927ed1f 100644 --- a/src/tests/test_stashcache.py +++ b/src/tests/test_stashcache.py @@ -1,5 +1,6 @@ from configparser import ConfigParser import copy + import flask import pytest import re @@ -279,6 +280,7 @@ def validate_cache_schema(cc): assert HOST_PORT_RE.match(cc["auth_endpoint"]) assert HOST_PORT_RE.match(cc["endpoint"]) assert cc["resource"] and isinstance(cc["resource"], str) + assert "production" in cc and isinstance(cc["production"], (type(None), bool)) @staticmethod def validate_namespace_schema(ns):