From c10a3e3824e2cc8d0e0a7cacfbc0a7c68e09d55f Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Mon, 20 May 2024 13:52:09 -0500 Subject: [PATCH 01/63] Fix some 'too broad exception' and 'shadows built-in name' warnings --- src/webapp/forms.py | 4 ++-- src/webapp/models.py | 44 ++++++++++++++++++++++---------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/webapp/forms.py b/src/webapp/forms.py index b6a7d60f6..f45bb3b9f 100644 --- a/src/webapp/forms.py +++ b/src/webapp/forms.py @@ -200,7 +200,7 @@ def get_yaml(self, resources, service_names_by_resource) -> str: yaml = "" for index, resource in enumerate(resources): yaml += models.get_downtime_yaml( - id=dtid+index, + id_=dtid + index, start_datetime=self.get_start_datetime(), end_datetime=self.get_end_datetime(), created_datetime=created_datetime, @@ -293,7 +293,7 @@ def get_yaml(self) -> str: dtid = models._dtid(created_datetime) return models.get_downtime_yaml( - id=dtid, + id_=dtid, start_datetime=self.get_start_datetime(), end_datetime=self.get_end_datetime(), created_datetime=created_datetime, diff --git a/src/webapp/models.py b/src/webapp/models.py index 702cf7b24..f1959faa8 100644 --- a/src/webapp/models.py +++ b/src/webapp/models.py @@ -186,10 +186,10 @@ def get_contact_db_data(self) -> Optional[ContactsData]: if ok: try: self.contacts_data.update(contacts_reader.get_contacts_data(self.contacts_file)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update contacts data") + log.exception("Failed to update contacts data (%s)", err) self.contacts_data.try_again() else: self.contacts_data.try_again() @@ -213,10 +213,10 @@ def get_comanage_data(self) -> Optional[ContactsData]: idmap = self.get_cilogon_ldap_id_map() data = ldap_data.cilogon_id_map_to_yaml_data(idmap) self.comanage_data.update(ContactsData(data)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update comanage data") + log.exception("Failed to update comanage data (%s)", err) self.comanage_data.try_again() return self.comanage_data.data @@ -238,10 +238,10 @@ def get_contacts_data(self) -> Optional[ContactsData]: yd2 = self.get_contact_db_data().yaml_data yd_merged = ldap_data.merge_yaml_data(yd1, yd2) self.merged_contacts_data.update(ContactsData(yd_merged)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update merged contacts data") + log.exception("Failed to update merged contacts data (%s)", err) self.merged_contacts_data.try_again() return self.merged_contacts_data.data @@ -262,10 +262,10 @@ def get_ligo_dn_list(self) -> Optional[List[str]]: ligo_ldap_pass = readfile(self.ligo_ldap_passfile, log) new_dn_list = ldap_data.get_ligo_ldap_dn_list(self.ligo_ldap_url, self.ligo_ldap_user, ligo_ldap_pass) self.ligo_dn_list.update(new_dn_list) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update LIGO data") + log.exception("Failed to update LIGO data (%s)", err) self.ligo_dn_list.try_again() return self.ligo_dn_list.data @@ -279,10 +279,10 @@ def get_dns(self) -> Optional[Set]: contacts_data = self.get_contacts_data() try: self.dn_set.update(set(contacts_data.get_dns())) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update DNs") + log.exception("Failed to update DNs (%s)", err) self.contacts_data.try_again() return self.dn_set.data @@ -305,10 +305,10 @@ def update_topology(self): if ok: try: self.topology.update(rg_reader.get_topology(self.topology_dir, self.get_contacts_data(), strict=self.strict)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update topology") + log.exception("Failed to update topology (%s)", err) self.topology.try_again() else: self.topology.try_again() @@ -324,10 +324,10 @@ def get_vos_data(self) -> Optional[VOsData]: if ok: try: self.vos_data.update(vo_reader.get_vos_data(self.vos_dir, self.get_contacts_data(), strict=self.strict)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update VOs") + log.exception("Failed to update VOs (%s)", err) self.vos_data.try_again() else: self.vos_data.try_again() @@ -345,10 +345,10 @@ def get_projects(self) -> Optional[Dict]: if ok: try: self.projects.update(project_reader.get_projects(self.projects_dir, strict=self.strict)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update projects") + log.exception("Failed to update projects (%s)", err) self.projects.try_again() else: self.projects.try_again() @@ -368,10 +368,10 @@ def get_mappings(self, strict=None) -> Optional[mappings.Mappings]: if ok: try: self.mappings.update(mappings.get_mappings(indir=self.mappings_dir, strict=strict)) - except Exception: + except Exception as err: if self.strict: raise - log.exception("Failed to update mappings") + log.exception("Failed to update mappings (%s)", err) self.mappings.try_again() else: self.mappings.try_again() @@ -387,7 +387,7 @@ def _dtid(created_datetime: datetime.datetime): return int((timestamp - dtid_offset) * multiplier) -def get_downtime_yaml(id: int, +def get_downtime_yaml(id_: int, start_datetime: datetime.datetime, end_datetime: datetime.datetime, created_datetime: datetime.datetime, @@ -403,8 +403,8 @@ def get_downtime_yaml(id: int, """ - def render(key, value): - return yaml.safe_dump({key: value}, default_flow_style=False).strip() + def render(key_, value_): + return yaml.safe_dump({key_: value_}, default_flow_style=False).strip() def indent(in_str, amount): spaces = ' ' * amount @@ -416,7 +416,7 @@ def indent(in_str, amount): result = "- " + render("Class", class_) for key, value in [ - ("ID", id), + ("ID", id_), ("Description", description), ("Severity", severity), ("StartTime", start_time_str), From 1f44eac88374c15d45fdf6c5ea24f960a5c8e856 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 22 May 2024 18:56:11 -0700 Subject: [PATCH 02/63] Adding NCAR S3 origin Adding NCAR S3 origin --- .../NCAR-OSDF.yaml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml index ffba18a83..dc3c11656 100644 --- a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml +++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml @@ -29,3 +29,30 @@ Resources: auth_endpoint_override: ncar.nationalresearchplatform.org:8443 AllowedVOs: - ANY + +NCAR_OSDF_S3_ORIGIN: + Active: true + Description: NCAR OSDF S3 Origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Secondary: + Name: Diego Davila + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=ncar.nationalresearchplatform.org + FQDN: ncar.nationalresearchplatform.org + Services: + XRootD origin server: + Description: NCAR OSDF Origin + Details: + endpoint_override: ncar.nationalresearchplatform.org:8444 + auth_endpoint_override: ncar.nationalresearchplatform.org:8444 + AllowedVOs: + - ANY + \ No newline at end of file From 770356846b47e707f05525fe09257698a7fed140 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 23 May 2024 16:27:11 -0700 Subject: [PATCH 03/63] Adding FDP origin Adding FDP origin --- .../National Fusion Facility/FDP-OSDF.yaml | 24 +++++++++++++++++++ .../DIII-D/National Fusion Facility/SITE.yaml | 9 +++++++ 2 files changed, 33 insertions(+) create mode 100644 topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml create mode 100644 topology/DIII-D/National Fusion Facility/SITE.yaml diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml new file mode 100644 index 000000000..3a4492eda --- /dev/null +++ b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml @@ -0,0 +1,24 @@ +Production: true +SupportCenter: Self Supported +GroupDescription: Fusion Data Platform ( + +Resources: + FDP_OSDF_CACHE: + Active: true + Description: FDP OSDF cache + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: + FQDN: + Services: + XRootD origins server: + Description: StashCache cache server for FDP project + AllowedVOs: + - ANY diff --git a/topology/DIII-D/National Fusion Facility/SITE.yaml b/topology/DIII-D/National Fusion Facility/SITE.yaml new file mode 100644 index 000000000..495c22949 --- /dev/null +++ b/topology/DIII-D/National Fusion Facility/SITE.yaml @@ -0,0 +1,9 @@ +LongName: DIII-D National Fusion Facility +Description: Fusion Data Platform +AddressLine1: 3483 Dunhill St. +City: San Diego +Country: US +Latitude: 32.90246879605678 +Longitude: -117.2283010938664 +State: CA +Zipcode: 92121 \ No newline at end of file From 8503cfca1eb7977bf16f2b7025cd5901c10a5ecf Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 28 May 2024 13:32:32 -0700 Subject: [PATCH 04/63] fixing hostname fixing hostname --- .../NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml index dc3c11656..ff8e8ba96 100644 --- a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml +++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml @@ -45,14 +45,14 @@ NCAR_OSDF_S3_ORIGIN: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: /CN=ncar.nationalresearchplatform.org - FQDN: ncar.nationalresearchplatform.org + DN: /CN=ncar-s3-origin.nationalresearchplatform.org + FQDN: ncar-s3-origin.nationalresearchplatform.org Services: XRootD origin server: Description: NCAR OSDF Origin Details: - endpoint_override: ncar.nationalresearchplatform.org:8444 - auth_endpoint_override: ncar.nationalresearchplatform.org:8444 + endpoint_override: ncar-s3-origin.nationalresearchplatform.org:8444 + auth_endpoint_override: ncar-s3-origin.nationalresearchplatform.org:8444 AllowedVOs: - ANY - \ No newline at end of file + From 7dc99e2328c1d76ff85f7237f85a03cc20b4fd2b Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 28 May 2024 15:14:41 -0700 Subject: [PATCH 05/63] fixing hostname --- .../National Fusion Facility/FDP-OSDF.yaml | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml index 3a4492eda..14eecd15b 100644 --- a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml +++ b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml @@ -1,10 +1,10 @@ Production: true SupportCenter: Self Supported -GroupDescription: Fusion Data Platform ( +GroupDescription: Fusion Data Platform Resources: FDP_OSDF_CACHE: - Active: true + Active: false Description: FDP OSDF cache ContactLists: Administrative Contact: @@ -15,10 +15,30 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: - FQDN: + DN: fdp-d3d-cache.nationalresearchplatform.org + FQDN: /CN=fdp-d3d-cache.nationalresearchplatform.org Services: - XRootD origins server: - Description: StashCache cache server for FDP project + XRootD cache server: + Description: OSDF cache server for FDP project + AllowedVOs: + - ANY + + FDP_OSDF_ORIGIN: + Active: false + Description: FDP OSDF origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: fdp-d3d-origin.nationalresearchplatform.org + FQDN: /CN=fdp-d3d-origin.nationalresearchplatform.org + Services: + XRootD cache server: + Description: OSDF origin server for FDP project AllowedVOs: - ANY From dcb82ddb9136bbfbf9d5cab3cad82ac2eb8da18e Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 28 May 2024 18:41:53 -0700 Subject: [PATCH 06/63] fixing yaml fixing yaml --- topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml index 14eecd15b..c98c552f9 100644 --- a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml +++ b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml @@ -1,10 +1,9 @@ Production: true SupportCenter: Self Supported GroupDescription: Fusion Data Platform - Resources: FDP_OSDF_CACHE: - Active: false + Active: true Description: FDP OSDF cache ContactLists: Administrative Contact: @@ -22,7 +21,7 @@ Resources: Description: OSDF cache server for FDP project AllowedVOs: - ANY - + FDP_OSDF_ORIGIN: Active: false Description: FDP OSDF origin From 4e95eed1c30f053deccac1277dadf21692132a61 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 29 May 2024 16:54:21 -0500 Subject: [PATCH 07/63] Update FDP-OSDF.yaml Fix DN and FQDN --- topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml index c98c552f9..464c1d323 100644 --- a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml +++ b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml @@ -14,8 +14,8 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: fdp-d3d-cache.nationalresearchplatform.org - FQDN: /CN=fdp-d3d-cache.nationalresearchplatform.org + DN: /CN=fdp-d3d-cache.nationalresearchplatform.org + FQDN: fdp-d3d-cache.nationalresearchplatform.org Services: XRootD cache server: Description: OSDF cache server for FDP project @@ -34,8 +34,8 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: fdp-d3d-origin.nationalresearchplatform.org - FQDN: /CN=fdp-d3d-origin.nationalresearchplatform.org + DN: /CN=fdp-d3d-origin.nationalresearchplatform.org + FQDN: fdp-d3d-origin.nationalresearchplatform.org Services: XRootD cache server: Description: OSDF origin server for FDP project From ad7489ed688581d4b7eb586c369ebbaf0f6b1909 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 29 May 2024 19:17:46 -0700 Subject: [PATCH 08/63] Adding MI cache Adding MI cache --- .../MI-OSDF.yaml | 28 +++++++++++++++++++ .../University of Missouri Clusters/SITE.yaml | 7 +++++ 2 files changed, 35 insertions(+) create mode 100644 topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml create mode 100644 topology/University of Missouri/University of Missouri Clusters/SITE.yaml diff --git a/topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml b/topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml new file mode 100644 index 000000000..ba0b9ebc6 --- /dev/null +++ b/topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml @@ -0,0 +1,28 @@ +Production: true +SupportCenter: Community Support Center +GroupDescription: Compute infrastructure +GroupID: 1335 + +Resources: + MI_NRP_OSDF_ORIGIN: + Active: false + Description: MI NRP origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Secondary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=mi-origin.nationalresearchplatform.org + FQDN: mi-origin.nationalresearchplatform.org + Services: + XRootD origin server: + Description: MI NRP origin + AllowedVOs: + - ANY diff --git a/topology/University of Missouri/University of Missouri Clusters/SITE.yaml b/topology/University of Missouri/University of Missouri Clusters/SITE.yaml new file mode 100644 index 000000000..774efd466 --- /dev/null +++ b/topology/University of Missouri/University of Missouri Clusters/SITE.yaml @@ -0,0 +1,7 @@ +City: Columbia +Country: United States +Description: Entry for hosted CE submitting to University of Missouri clusters +Latitude: 38.9410516354836 +Longitude: -92.32573369440686 +State: MO +Zipcode: '65211' \ No newline at end of file From da2ce561c4d514a43d98c8a2018e58c3ea17590c Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 30 May 2024 15:31:09 -0700 Subject: [PATCH 09/63] adding details to the Site and src adding details to the Site and src --- .../MI-OSDF.yaml => Missouri ITRSS/Missouri-Rise.yaml} | 10 +++++----- .../SITE.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename topology/University of Missouri/{University of Missouri Clusters/MI-OSDF.yaml => Missouri ITRSS/Missouri-Rise.yaml} (73%) rename topology/University of Missouri/{University of Missouri Clusters => Missouri ITRSS}/SITE.yaml (60%) diff --git a/topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml similarity index 73% rename from topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml rename to topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml index ba0b9ebc6..085575406 100644 --- a/topology/University of Missouri/University of Missouri Clusters/MI-OSDF.yaml +++ b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml @@ -4,9 +4,9 @@ GroupDescription: Compute infrastructure GroupID: 1335 Resources: - MI_NRP_OSDF_ORIGIN: + Missouri-Rise-Origin1-NRP: Active: false - Description: MI NRP origin + Description: MO NRP origin ContactLists: Administrative Contact: Primary: @@ -19,10 +19,10 @@ Resources: Primary: Name: Fabio Andrijauskas ID: OSG1000162 - DN: /CN=mi-origin.nationalresearchplatform.org - FQDN: mi-origin.nationalresearchplatform.org + DN: /CN=mo-origin.nationalresearchplatform.org + FQDN: mo-origin.nationalresearchplatform.org Services: XRootD origin server: - Description: MI NRP origin + Description: MO NRP origin AllowedVOs: - ANY diff --git a/topology/University of Missouri/University of Missouri Clusters/SITE.yaml b/topology/University of Missouri/Missouri ITRSS/SITE.yaml similarity index 60% rename from topology/University of Missouri/University of Missouri Clusters/SITE.yaml rename to topology/University of Missouri/Missouri ITRSS/SITE.yaml index 774efd466..500a824ba 100644 --- a/topology/University of Missouri/University of Missouri Clusters/SITE.yaml +++ b/topology/University of Missouri/Missouri ITRSS/SITE.yaml @@ -1,6 +1,6 @@ City: Columbia Country: United States -Description: Entry for hosted CE submitting to University of Missouri clusters +Description: Missouri ITRSS Latitude: 38.9410516354836 Longitude: -92.32573369440686 State: MO From ca3bb128da25f10007adc7440b0c5e1902700695 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 31 May 2024 10:38:18 -0500 Subject: [PATCH 10/63] Update Missouri-Rise.yaml --- .../University of Missouri/Missouri ITRSS/Missouri-Rise.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml index 085575406..89602d443 100644 --- a/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml +++ b/topology/University of Missouri/Missouri ITRSS/Missouri-Rise.yaml @@ -1,7 +1,6 @@ Production: true SupportCenter: Community Support Center GroupDescription: Compute infrastructure -GroupID: 1335 Resources: Missouri-Rise-Origin1-NRP: From 9982e4dae436f9b40e0ed2e3d402b2753cb2ac82 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 31 May 2024 10:55:39 -0500 Subject: [PATCH 11/63] Update NCAR-OSDF.yaml --- .../NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml index ff8e8ba96..0f9125536 100644 --- a/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml +++ b/topology/National Center for Atmospheric Research/NCAR-Wyoming Supercomputing Center/NCAR-OSDF.yaml @@ -30,7 +30,7 @@ Resources: AllowedVOs: - ANY -NCAR_OSDF_S3_ORIGIN: + NCAR_OSDF_S3_ORIGIN: Active: true Description: NCAR OSDF S3 Origin ContactLists: @@ -55,4 +55,3 @@ NCAR_OSDF_S3_ORIGIN: auth_endpoint_override: ncar-s3-origin.nationalresearchplatform.org:8444 AllowedVOs: - ANY - From 643742011cabe456484851e2431a4994430f8d86 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:42:12 -0500 Subject: [PATCH 12/63] Create GATech_Ramprasad.yaml --- projects/GATech_Ramprasad.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/GATech_Ramprasad.yaml diff --git a/projects/GATech_Ramprasad.yaml b/projects/GATech_Ramprasad.yaml new file mode 100644 index 000000000..72c09fbb8 --- /dev/null +++ b/projects/GATech_Ramprasad.yaml @@ -0,0 +1,8 @@ +Department: Material Science +Description: 'Develop and apply computational and machine learning tools to accelerate + materials discovery. More information can be found here: https://ramprasad.mse.gatech.edu/' +FieldOfScience: Materials Science +FieldOfScienceID: 14.1801b +InstitutionID: https://osg-htc.org/iid/uvf22j6xjbtv +Organization: Georgia Institute of Technology +PIName: Rampi Ramprasad From 145b34270ebf49d2b9f07d036452d94623f72bac Mon Sep 17 00:00:00 2001 From: Aaron Moate Date: Mon, 3 Jun 2024 12:52:32 -0500 Subject: [PATCH 13/63] Set "Active" to false for CHTC-submit-1 It's been retired --- topology/University of Wisconsin/CHTC/CHTC.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 9818d27f1..052262980 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -45,7 +45,7 @@ Resources: VOOwnership: GLOW: 100 CHTC-submit-1: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From 7a82b602d088cbf8d1e070d94f70b05007cdd8d8 Mon Sep 17 00:00:00 2001 From: Aaron Moate Date: Mon, 3 Jun 2024 12:54:19 -0500 Subject: [PATCH 14/63] Set "Active" to false for CHTC-submit2 It's been retired --- topology/University of Wisconsin/CHTC/CHTC.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 052262980..774959ec5 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -68,7 +68,7 @@ Resources: VOOwnership: GLOW: 100 CHTC-submit2: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From ff5bf5aa4e2deeab9a446750fda61d4c1392bca4 Mon Sep 17 00:00:00 2001 From: Aaron Moate Date: Mon, 3 Jun 2024 13:09:26 -0500 Subject: [PATCH 15/63] Register CHTC-ap2001 and CHTC-ap2002 Done in support of INF-1372: Provision 2 CHTC Access Points on new hardware https://opensciencegrid.atlassian.net/browse/INF-1372 --- .../University of Wisconsin/CHTC/CHTC.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 9818d27f1..f4035deb6 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -612,4 +612,52 @@ Resources: Tags: - OSPool + CHTC-ap2001: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: CHTC Access Point + FQDN: ap2001.chtc.wisc.edu + ID: 10370 + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + + CHTC-ap2002: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: CHTC Access Point + FQDN: ap2002.chtc.wisc.edu + ID: 10371 + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + SupportCenter: GLOW-TECH From d6da163cedd492a5cd144ec1e46f69f5198887dc Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 4 Jun 2024 04:04:15 -0500 Subject: [PATCH 16/63] Update SWT2 CPU normalization factor per Armen --- .../SWT2 ATLAS UTA/SWT2_CPB.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml index ad6a78cb6..a2dcf0b85 100644 --- a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml +++ b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml @@ -34,7 +34,7 @@ Resources: VOOwnership: ATLAS: 100 WLCGInformation: - APELNormalFactor: 10.43 + APELNormalFactor: 12.52 AccountingName: US-SWT2 HEPSPEC: 102816 InteropAccounting: true @@ -73,7 +73,7 @@ Resources: VOOwnership: ATLAS: 100 WLCGInformation: - APELNormalFactor: 10.43 + APELNormalFactor: 12.52 AccountingName: US-SWT2 HEPSPEC: 102816 InteropAccounting: false From f9644652b9d3c7af618845ccbfc87af536998a35 Mon Sep 17 00:00:00 2001 From: Tim Cartwright Date: Tue, 4 Jun 2024 11:11:32 -0500 Subject: [PATCH 17/63] Added ORU contacts; FD #76429 --- .../ORU - Computing Group/ORU-Titan.yaml | 60 +++++++------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml index ad9013855..5f8359912 100644 --- a/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml +++ b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan.yaml @@ -26,53 +26,37 @@ Resources: # If you have an up-to-date local git clone, fill ID with the output from `bin/next_resource_id` # Otherwise, leave it blank and we will fill in the appropriate value for you. ID: 1462 - # ContactLists contain information about people to contact regarding this resource. - # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml - # If you cannot find the contact above XML, please register the contact: - # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: - # Administrative Contacts are persons or groups of people (i.e., - # mailing lists) that are directly responsible for the - # maintenance of the resource Administrative Contact: Primary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: - - # Security Contact are persons or groups of people (i.e., - # mailing lists) that are responsible for handling security - # issues related to the resource Administrative Contact: Primary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: - - # Site contact (optional) are persons or groups of people (i.e., - # mailing lists) that are generally responsible for a site's - # relationship with the OSG (e.g., principal investigators, - # local administrator contact for OSG Hosted CEs) - # Site Contact: - # Primary: - # Name: - # ID: - # Secondary: - # Name: - # ID: - # Tertiary: - # Name: - # ID: + Local Executive Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 + Local Operational Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 + Local Security Contact: + Primary: + Name: Stephen Wheat + ID: OSG1000693 + Secondary: + Name: Jan Heinrich Rolf Woerner + ID: OSG1000703 # FQDN is the fully qualified domain name of the host running this resource FQDN: oru-titan-ce1.svc.opensciencegrid.org From 127fd5b233e77694aed32a72c8c87b134bc527cf Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 4 Jun 2024 10:03:33 -0700 Subject: [PATCH 18/63] Revert "Setting Esnet caches to Any VO" --- topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml | 2 +- topology/Energy Sciences Network/London/ESnetLondon.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml index f2ed868fd..b81bda81b 100644 --- a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam.yaml @@ -22,4 +22,4 @@ Resources: XRootD cache server: Description: ESnet Amsterdam Cache AllowedVOs: - - ANY \ No newline at end of file + - LIGO diff --git a/topology/Energy Sciences Network/London/ESnetLondon.yaml b/topology/Energy Sciences Network/London/ESnetLondon.yaml index 934ded268..5fe582291 100644 --- a/topology/Energy Sciences Network/London/ESnetLondon.yaml +++ b/topology/Energy Sciences Network/London/ESnetLondon.yaml @@ -22,4 +22,4 @@ Resources: XRootD cache server: Description: Internet2 London Cache AllowedVOs: - - ANY + - LIGO From 7edc0a4d9b52cb05b742c7561c4c96ec0bdd89bd Mon Sep 17 00:00:00 2001 From: imakarkins <152288464+imakarkins@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:52:55 +0300 Subject: [PATCH 19/63] Adding a new compute entrypoint to the T2_LV_HPCNET Adding new Resource Group for T2_LV_HPCNET site. --- .../RTU-CMS/RTU.yaml | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+) create mode 100644 topology/Riga Technical University/RTU-CMS/RTU.yaml diff --git a/topology/Riga Technical University/RTU-CMS/RTU.yaml b/topology/Riga Technical University/RTU-CMS/RTU.yaml new file mode 100644 index 000000000..63a11cfee --- /dev/null +++ b/topology/Riga Technical University/RTU-CMS/RTU.yaml @@ -0,0 +1,179 @@ +# Production is true if the resources in this group will join the production OSG pool, +# and not the Integration Test Bed (ITB) pool. +Production: true +# SupportCenter is one of the support centers in topology/support-centers.yaml +SupportCenter: Self Supported + +# GroupDescription is a long description of the resource group; may be multiple lines. +GroupDescription: LV RTU CMS Tier2 HPC Cluster + +# Resources contains one or more resources in this +# ResourceGroup. A resource provides one or more services +Resources: + # Resource Name should be a short descriptor of the resource. + # e.g. the Center for High Throughput Computing's GlideinWMS Frontend is "CHTC-glidein2" + # Resource Names need to be unique across all resources in the OSG. + T2_LV_HPCNET-CE: + # Active is true if the resource is accepting requests, and false otherwise. + # When first registering a resource, set this to false. Set it to true when it's ready for production. + Active: false + # Description is a long description of the resource; may be multiple lines + Description: This is a ARC-CE for T2_LV_HPCNET. + # ContactLists contain information about people to contact regarding this resource. + # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml + # If you cannot find the contact above XML, please register the contact: + # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: + # Administrative Contacts are persons or groups of people (i.e., + # mailing lists) that are directly responsible for the + # maintenance of the resource + Administrative Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Security Contact are persons or groups of people (i.e., + # mailing lists) that are responsible for handling security + # issues related to the resource + Security Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Local contacts are an optional set of persons or groups of + # people (i.e., mailing lists) if they are a different from the + # persons responsible for the resouce. For example, OSG Hosted + # CEs are operated by OSG Staff, who are separate from the local + # contacts that are responsible for running the site's scheduler + + # (OPTIONAL) Local Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Local Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Operaitonal Contacts are persons or groups of + # people (i.e., mailing lists) that are directly responsible for the + # maintenance of the site's integration with the OSG resource + # Local Operational Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Security Contacts are persons or groups of + # mailing lists) that are responsible for handling security + # issues related to the site's integration with the OSG resource + # Local Security Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # FQDN is the fully qualified domain name of the host running this resource + FQDN: ce-arc.tier2.hpc-net.lv + ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed + # FQDNAliases: + # - + # - + + ### DN (optional except for XCache resources) is the DN of the host cert of the resource + # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...) + # DN: + + # Services is one or more services provided by this resource; + # valid services are listed in topology/services.yaml with the format ": " + Services: + CE: + # Description is a brief description of the service + Description: Hosted ARC-CE + ### Details (optional) + # Details: + # # hidden + # hidden: false + # ### uri_override (optional, use if your service is on some non-standard URL) + # # uri_override: : + # ### sam_uri (optional) + # # sam_uri: htcondor://... + # ### endpoint (for perfSONAR services) + # # endpoint: + + # Other services if you have any + # : + # ... + + ### Tags (optional) is a list of tags associated with the resource. + ### Include the tag "CC*" if applicable for a CC* CE. + # Tags: + # - CC* + # - + + ### VOOwnership (optional) is the percentage of the resource owned by one or more VOs. + ### If part of the resource is not owned by the VO, do not list it. + ### The total percentage cannot exceed 100. + # VOOwnership: + # : + # : + + ### WLCGInformation (optional) is only for resources that are part of the WLCG + # WLCGInformation: + # APELNormalFactor: 0.0 + # HEPScore23Percentage: 0.0 + # AccountingName: + # HEPSPEC: 0 + # InteropAccounting: true + # InteropBDII: true + # InteropMonitoring: true + # KSI2KMax: 0 + # KSI2KMin: 0 + # StorageCapacityMax: 0 + # StorageCapacityMin: 0 + # TapeCapacity: 0 + + # Other resources if you have any... + # : + # ... From 32bc8a1b8b627666d5092e3a2befc147459b70ed Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 4 Jun 2024 11:00:38 -0700 Subject: [PATCH 20/63] Add downtime for SDSC_NRP_OSDF_ORIGIN due to toPelican --- .../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 430431ba7..641fc3907 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 @@ -64,3 +64,14 @@ Services: - XRootD origin server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1825239949 + Description: toPelican + Severity: Outage + StartTime: Jun 03, 2024 08:01 +0000 + EndTime: Jun 08, 2024 08:01 +0000 + CreatedTime: Jun 04, 2024 17:59 +0000 + ResourceName: SDSC_NRP_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- From b89dffca11ada6989c02c015be602c6a0ae659a9 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 4 Jun 2024 13:36:00 -0500 Subject: [PATCH 21/63] Update CHTC-OSDF_downtime.yaml --- .../CHTC/CHTC-OSDF_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml b/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml index d2e15bbe6..e313d1629 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-OSDF_downtime.yaml @@ -186,3 +186,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1825261289 + Description: received complaints about overloading + Severity: Intermittent Outage + StartTime: Jun 04, 2024 18:35 +0000 + EndTime: Jul 06, 2024 18:35 +0000 + CreatedTime: Jun 04, 2024 18:35 +0000 + ResourceName: CHTC_STASHCACHE_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 299dc027131ad95ee7c3651461a84898eb645703 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 4 Jun 2024 11:51:16 -0700 Subject: [PATCH 22/63] adding end and auth point --- .../Nebraska-Lincoln/UNLCachingInfrastructure.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml index b40074f1c..55341281a 100644 --- a/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLCachingInfrastructure.yaml @@ -126,5 +126,8 @@ Resources: Services: XRootD cache server: Description: Nebraska NRP OSDF Cache + Details: + endpoint_override: unl-cache.nationalresearchplatform.org:8443 + auth_endpoint_override: unl-cache.nationalresearchplatform.org:8443 AllowedVOs: - ANY From c64b5be30c5ec0d44d39ac9c949e2ea712bb2095 Mon Sep 17 00:00:00 2001 From: imakarkins <152288464+imakarkins@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:46:09 +0300 Subject: [PATCH 23/63] Added Squid service for T2_LV_HPNET resource group Added Squid service for T2_LV_HPNET resource group --- .../RTU-CMS/RTU.yaml | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/topology/Riga Technical University/RTU-CMS/RTU.yaml b/topology/Riga Technical University/RTU-CMS/RTU.yaml index 63a11cfee..74d76e18b 100644 --- a/topology/Riga Technical University/RTU-CMS/RTU.yaml +++ b/topology/Riga Technical University/RTU-CMS/RTU.yaml @@ -177,3 +177,131 @@ Resources: # Other resources if you have any... # : # ... + T2_LV_HPCNET-SQUID: + # Active is true if the resource is accepting requests, and false otherwise. + # When first registering a resource, set this to false. Set it to true when it's ready for production. + Active: false + # Description is a long description of the resource; may be multiple lines + Description: This is Frontier squid proxy for T2_LV_HPCNET. + # ContactLists contain information about people to contact regarding this resource. + # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml + # If you cannot find the contact above XML, please register the contact: + # https://opensciencegrid.org/docs/common/registration/#registering-contacts + ContactLists: + # Administrative Contacts are persons or groups of people (i.e., + # mailing lists) that are directly responsible for the + # maintenance of the resource + Administrative Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Security Contact are persons or groups of people (i.e., + # mailing lists) that are responsible for handling security + # issues related to the resource + Security Contact: + Primary: + Name: Igors Makarkins + ID: OSG1000678 + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # Local contacts are an optional set of persons or groups of + # people (i.e., mailing lists) if they are a different from the + # persons responsible for the resouce. For example, OSG Hosted + # CEs are operated by OSG Staff, who are separate from the local + # contacts that are responsible for running the site's scheduler + + # (OPTIONAL) Local Executive Contacts are persons or groups of + # people (i.e., mailing lists) are responsible for making policy + # decisions regarding the site's integration with the OSG resource + # Local Executive Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Operaitonal Contacts are persons or groups of + # people (i.e., mailing lists) that are directly responsible for the + # maintenance of the site's integration with the OSG resource + # Local Operational Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # (OPTIONAL) Local Security Contacts are persons or groups of + # mailing lists) that are responsible for handling security + # issues related to the site's integration with the OSG resource + # Local Security Contact: + # Primary: + # Name: + # ID: + # Secondary: + # Name: + # ID: + # Tertiary: + # Name: + # ID: + + # FQDN is the fully qualified domain name of the host running this resource + FQDN: squid.tier2.hpc-net.lv + ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed + # FQDNAliases: + # - + # - + + ### DN (optional except for XCache resources) is the DN of the host cert of the resource + # in OpenSSL 1.0 format (i.e. /DC=org/DC=incommon/C=US/...) + # DN: + + # Services is one or more services provided by this resource; + # valid services are listed in topology/services.yaml with the format ": " + Services: + Squid: + # Description is a brief description of the service + Description: Frontier squid proxy used by CVMFS clients on our cluster + ### Details (optional) + # Details: + # # hidden + # hidden: false + # ### uri_override (optional, use if your service is on some non-standard URL) + # # uri_override: : + # ### sam_uri (optional) + # # sam_uri: htcondor://... + # ### endpoint (for perfSONAR services) + # # endpoint: From 4863adb909460f64641b45158fde0d85a5845ea1 Mon Sep 17 00:00:00 2001 From: Ilija Vukotic Date: Wed, 5 Jun 2024 17:03:50 +0200 Subject: [PATCH 24/63] change of startlight node --- topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml index bc7babed3..da7091616 100644 --- a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml +++ b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml @@ -756,12 +756,12 @@ Resources: ID: OSG1000064 Name: Ilija Vukotic Description: Varnish cache located at Starlight, Chicago, IL - FQDN: igrok-chcg.pacificwave.net + FQDN: dtn108.sl.startap.net Services: Squid: Description: Varnish based squid service for CVMFS at NRP Details: - uri_override: igrok-chcg.pacificwave.net:6081 + uri_override: dtn108.sl.startap.net:6081 Monitored: true VOOwnership: ATLAS: 100 From 0d402c6064fbf88d284758d4f698494c426bb5a0 Mon Sep 17 00:00:00 2001 From: Ilija Vukotic Date: Wed, 5 Jun 2024 17:07:09 +0200 Subject: [PATCH 25/63] port fix --- topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml index da7091616..59a91549e 100644 --- a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml +++ b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml @@ -761,7 +761,7 @@ Resources: Squid: Description: Varnish based squid service for CVMFS at NRP Details: - uri_override: dtn108.sl.startap.net:6081 + uri_override: dtn108.sl.startap.net:6082 Monitored: true VOOwnership: ATLAS: 100 From aa7e12008aca65a9d8320cce9d7d64668d0d0839 Mon Sep 17 00:00:00 2001 From: Rachel Lombardi <37351287+rachellombardi@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:23:41 -0500 Subject: [PATCH 26/63] Create UTA_Goplerud.yaml --- projects/UTA_Goplerud.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 projects/UTA_Goplerud.yaml diff --git a/projects/UTA_Goplerud.yaml b/projects/UTA_Goplerud.yaml new file mode 100644 index 000000000..4fd376a3e --- /dev/null +++ b/projects/UTA_Goplerud.yaml @@ -0,0 +1,12 @@ +Department: Department of Government +Description: I create new methods to facilitate political science research by leveraging + the intersection of Bayesian methods and machine learning. My papers create new + methods to tackle a variety of common problems (heterogeneous effects, hierarchical + models, ideal point estimation) where existing methods have limitations that constrain + substantive researchers. My existing papers can be found on my website https://mgoplerud.com/ + as well as on pre-print servers such as arxiv. +FieldOfScience: Statistics +FieldOfScienceID: 27.0599b +InstitutionID: Unknown +Organization: University of Texas at Austin +PIName: Max Goplerud From 00f6169ce4c926c21e1e5dd595675e7572a2d03f Mon Sep 17 00:00:00 2001 From: Brian Bockelman Date: Wed, 5 Jun 2024 13:04:38 -0500 Subject: [PATCH 27/63] Update the IssuerName for AP40 to match its local credmon setting The new change also matches what is used for Pelican. This should fix access to AP40 files from non-Pelican caches. --- 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 515ef2326..65a443ef6 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -196,7 +196,7 @@ DataFederations: - Path: /ospool/ap40/data Authorizations: - SciTokens: - Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 + Issuer: https://osg-htc.org/ospool Base Path: /ospool/ap40 Map Subject: True AllowedOrigins: From 84209e80d5bfe1783da463987729ea7358ed6681 Mon Sep 17 00:00:00 2001 From: Brian Bockelman Date: Wed, 5 Jun 2024 13:20:40 -0500 Subject: [PATCH 28/63] Correct base path for AP40 issuer The AP40 issuer generates authorizations of the form `/$USERNAME` for files in `/ospool/ap40/data/$USERNAME`. However, the base path for the issuer was set to `/ospool/ap40`. Dropping the `/data` component caused failures in non-Pelican caches. --- 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 65a443ef6..1c32fbf01 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -197,7 +197,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://osg-htc.org/ospool - Base Path: /ospool/ap40 + Base Path: /ospool/ap40/data Map Subject: True AllowedOrigins: - CHTC-ap40 From 973036861dc78968f6d9f8b7fabb70523776d1f5 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Wed, 5 Jun 2024 14:49:20 -0500 Subject: [PATCH 29/63] Fix multiline description in projects/UTA_Goplerud.yaml --- projects/UTA_Goplerud.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/UTA_Goplerud.yaml b/projects/UTA_Goplerud.yaml index 4fd376a3e..c93c4732f 100644 --- a/projects/UTA_Goplerud.yaml +++ b/projects/UTA_Goplerud.yaml @@ -1,5 +1,6 @@ Department: Department of Government -Description: I create new methods to facilitate political science research by leveraging +Description: > + I create new methods to facilitate political science research by leveraging the intersection of Bayesian methods and machine learning. My papers create new methods to tackle a variety of common problems (heterogeneous effects, hierarchical models, ideal point estimation) where existing methods have limitations that constrain From a7ba0f1363f8652ddcf3f0b41c3e10da96df9563 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 5 Jun 2024 15:17:31 -0700 Subject: [PATCH 30/63] fixing site position --- .../ComputeCanada - Cedar/SITE.yaml | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml b/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml index 823e7d400..f794e7f7b 100644 --- a/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml +++ b/topology/Compute Canada/ComputeCanada - Cedar/SITE.yaml @@ -1,18 +1,10 @@ -# LongName is the expanded name of the site LongName: Compute Canada Cedar Cluster -# Description is a brief description of your site Description: Cedar is a heterogeneous cluster suitable for a variety of workloads; it is located at Simon Fraser University. - -# If you have an up-to-date local git clone, fill ID with the output from `bin/next_site_id` -# Otherwise, leave it blank and we will fill in the appropriate value for you. ID: 10281 -AddressLine1: 2152 Hillside Road -City: Storrs - -Country: United States -State: CT -Zipcode: "06269-3046" - -Latitude: 41.8084 -Longitude: -72.2495 - +AddressLine1: 8888 University Drive +City: Burnaby +Country: Canada +State: BC +Zipcode: "V5A 1S66" +Latitude: 49.278639393188136 +Longitude: -122.91726450229353 From 4dce37d595ae6ee68043c298d46e48acfb3a735d Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 5 Jun 2024 15:38:17 -0700 Subject: [PATCH 31/63] removing old fdp cache --- .../SDSC-NRP.yaml | 26 +------------------ 1 file changed, 1 insertion(+), 25 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 1180bc778..669ec23b6 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 @@ -76,28 +76,4 @@ Resources: auth_endpoint_override: sdsc-s3-origin.nationalresearchplatform.org:8444 AllowedVOs: - ANY - SDSC_NRP_FDP_OSDF_CACHE: - Active: true - Description: SDSC NRP OSDF FDP project cache - ContactLists: - Administrative Contact: - Primary: - Name: Fabio Andrijauskas - ID: OSG1000162 - Secondary: - Name: Diego Davila - ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f - Security Contact: - Primary: - Name: Fabio Andrijauskas - ID: OSG1000162 - DN: /CN=fdp-cache.nationalresearchplatform.org - FQDN: fdp-cache.nationalresearchplatform.org - Services: - XRootD cache server: - Description: SDSC NRP FDP OSDF cache - Details: - endpoint_override: fdp-cache.nationalresearchplatform.org:8443 - auth_endpoint_override: fdp-cache.nationalresearchplatform.org:8443 - AllowedVOs: - - ANY + From bd9c78ae59707ac18008318b47f04cd475c2fd49 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 5 Jun 2024 15:40:59 -0700 Subject: [PATCH 32/63] adding endpoints adding endpoints --- topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml index 464c1d323..63e0af773 100644 --- a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml +++ b/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml @@ -19,6 +19,9 @@ Resources: Services: XRootD cache server: Description: OSDF cache server for FDP project + Details: + endpoint_override: fdp-d3d-cache.nationalresearchplatform.org:8443 + auth_endpoint_override: fdp-d3d-cache.nationalresearchplatform.org:8443 AllowedVOs: - ANY From 59f28e6bfba298738fe59bcf4b92a7fb1dc9bf2d Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Wed, 5 Jun 2024 16:32:12 -0700 Subject: [PATCH 33/63] Update University of California Irvine.yaml Add Service: Submit Node to gpatlas2.ps.uci.edu Update DNs from new certificates Switch "Site" with "Local Operational" for contacts and add Nathan Crawford to gpatlas2.ps.uci.edu Update Descriptions --- .../University of California Irvine.yaml | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/topology/UC Irvine/UCIT3/University of California Irvine.yaml b/topology/UC Irvine/UCIT3/University of California Irvine.yaml index 5ff72b19c..469664b10 100644 --- a/topology/UC Irvine/UCIT3/University of California Irvine.yaml +++ b/topology/UC Irvine/UCIT3/University of California Irvine.yaml @@ -12,17 +12,27 @@ Resources: Primary: ID: bb69da4f25103364b78eec103a2b084e289af8ee Name: Anyes Taffard + Local Operational Contact: + Primary: + ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + Name: Nathan Crawford Active: true - Description: UCI gridftp + Description: UCI gridftp and LHC @ UC glidein scheduler submit host. FQDN: gpatlas2.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas2.ps.uci.edu ID: 441 Services: GridFtp: Description: GridFtp Storage Element Details: hidden: false + Submit Node: + Description: OS Pool access point + Tags: + - OSPool VOOwnership: ATLAS: 100 + UCLHC IRVINE SUBMIT HOST: Active: true ContactLists: @@ -40,18 +50,17 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost - Site Contact: + Local Operational Contact: Primary: ID: dbcd20edf55fb43c78b2e547a393898b42643d29 Name: Nathan Crawford - Description: LHC @ UC glidein scheduler submit host. This host is hosted at UCI - and managed via puppet at UCSD. + Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-1.ps.uci.edu - DN: /DC=org/DC=incommon/C=US/ST=California/L=Irvine/O=University of California, Irvine/OU=School of Physical Sciences/CN=uclhc-1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-1.ps.uci.edu ID: 778 Services: Submit Node: - Description: OSG Submission Node + Description: OS Pool access point Details: hidden: false Tags: @@ -76,14 +85,13 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost - Site Contact: + Local Operational Contact: Primary: ID: dbcd20edf55fb43c78b2e547a393898b42643d29 Name: Nathan Crawford - Description: LHC @ UC glidein scheduler submit host. This host is hosted at UCI - and managed via puppet at UCSD. + Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-2.ps.uci.edu - DN: /DC=org/DC=incommon/C=US/ST=California/L=Irvine/O=University of California, Irvine/OU=School of Physical Sciences/CN=uclhc-2.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-2.ps.uci.edu ID: 1209 Services: Submit Node: From 489e48ec18e2a84a92e5b15d672ab192579dc450 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Thu, 6 Jun 2024 10:14:55 -0500 Subject: [PATCH 34/63] Update UTA_Goplerud.yaml with Institution ID --- projects/UTA_Goplerud.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/UTA_Goplerud.yaml b/projects/UTA_Goplerud.yaml index c93c4732f..bdc08b73d 100644 --- a/projects/UTA_Goplerud.yaml +++ b/projects/UTA_Goplerud.yaml @@ -8,6 +8,6 @@ Description: > as well as on pre-print servers such as arxiv. FieldOfScience: Statistics FieldOfScienceID: 27.0599b -InstitutionID: Unknown +InstitutionID: https://osg-htc.org/iid/6z0d22dz19io Organization: University of Texas at Austin PIName: Max Goplerud From 2dd30688912d9e017614dce15ede5448cd0e5862 Mon Sep 17 00:00:00 2001 From: Ilija Vukotic Date: Fri, 7 Jun 2024 09:46:51 +0200 Subject: [PATCH 35/63] new dns --- topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml index 59a91549e..5e6616250 100644 --- a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml +++ b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml @@ -756,12 +756,12 @@ Resources: ID: OSG1000064 Name: Ilija Vukotic Description: Varnish cache located at Starlight, Chicago, IL - FQDN: dtn108.sl.startap.net + FQDN: starlight.varnish.atlas-ml.org Services: Squid: Description: Varnish based squid service for CVMFS at NRP Details: - uri_override: dtn108.sl.startap.net:6082 + uri_override: starlight.varnish.atlas-ml.org:6082 Monitored: true VOOwnership: ATLAS: 100 From dde565e0ae7db5003453c28d1a3902be7d224440 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Fri, 7 Jun 2024 11:33:15 -0500 Subject: [PATCH 36/63] Fix Project form - If no shortname don't auto complete project name - Use the entire institutions api to populate the insitution field --- src/app.py | 3 +-- src/templates/generate_project_yaml.html.j2 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app.py b/src/app.py index 75e01bb40..30e7d4b25 100755 --- a/src/app.py +++ b/src/app.py @@ -867,10 +867,9 @@ def generate_project_yaml(): institution_short_names = {x[1]: x[0] for x in global_data.get_mappings().project_institution.items()} institutions = [] for institution in institution_api_data: - institutions.append((institution['id'], institution['name'], institution_short_names.get(institution['name'], ""))) + institutions.append((institution_short_names.get(institution['name'], ""), institution['name'])) def render_form(**kwargs): - institutions = list(global_data.get_mappings().project_institution.items()) session.pop("form_data", None) return render_template( diff --git a/src/templates/generate_project_yaml.html.j2 b/src/templates/generate_project_yaml.html.j2 index 4a63a3f9a..fb9926c80 100644 --- a/src/templates/generate_project_yaml.html.j2 +++ b/src/templates/generate_project_yaml.html.j2 @@ -152,7 +152,7 @@ Project YAML Generator function updateProjectName(){ project_name_node.readOnly = false - if(!(pi_institution_node.value in institutions) || !pi_last_name_node.value){ return } + if(!(pi_institution_node.value in institutions) || !institutions[pi_institution_node.value] || !pi_last_name_node.value){ return } let pi_institution = institutions[pi_institution_node.value] let pi_last_name = pi_last_name_node.value From be91cd9fa5ccabc25bdf703d04fa19366333649a Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 6 Jun 2024 16:21:56 -0500 Subject: [PATCH 37/63] Update automerge check to error on invalid institution ID --- src/webapp/automerge_check.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/webapp/automerge_check.py b/src/webapp/automerge_check.py index 7cc9e491c..77d621361 100755 --- a/src/webapp/automerge_check.py +++ b/src/webapp/automerge_check.py @@ -122,19 +122,26 @@ def main(args): errors += check_resource_contacts(BASE_SHA, rg_fname, resources_affected, contacts) - if any( re.match(br'^projects/.*\.yaml', fname) for fname in modified ): + updated_projects = [fname for fname in modified if re.match(br'^projects/.*\.yaml', fname)] + if updated_projects: orgs_base = get_organizations_at_version(base) orgs_new = get_organizations_at_version(head) orgs_added = orgs_new - orgs_base for org in sorted(orgs_added): errors += ["New Organization '%s' requires OSG approval" % org] + invalid_institutions = get_invalid_institution_ids(head, updated_projects) + errors += [ + f"Invalid InstitutionID in project(s) {invalid_institutions.join(', ')}.\n" + f"Please see https://topology-institutions.osg-htc.org for valid ID list." + ] else: orgs_added = None + invalid_institutions = None print_errors(errors) return ( RC.ALL_CHECKS_PASS if len(errors) == 0 else RC.OUT_OF_DATE_ONLY if len(errors) == 1 and not up_to_date - else RC.ORGS_ADDED if orgs_added + else RC.ORGS_ADDED if orgs_added or invalid_institutions else RC.DT_MOD_ERRORS if len(DTs) > 0 else RC.CONTACT_ERROR if not contacts else RC.NON_DT_ERRORS ) @@ -212,6 +219,11 @@ def get_organizations_at_version(sha): if re.search(br'.\.yaml$', fname) ] return set( p.get("Organization") for p in projects ) +def get_invalid_institution_ids(sha, fnames): + projects = { fname : parse_yaml_at_version(sha, fname, {}) for fname in fnames } + return [fname for fname, yaml in projects.items() if not yaml.get("InstitutionID", "").startswith("https://osg-htc.org/iid/")] + + def commit_is_merged(sha_a, sha_b): args = ['git', 'merge-base', '--is-ancestor', sha_a, sha_b] ret, out = runcmd(args, stderr=_devnull) From a178b15d45d66e95f1b8b44f31b8aae754f277e5 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 7 Jun 2024 13:37:56 -0500 Subject: [PATCH 38/63] check against prod list of institution ids when adding new institution --- src/webapp/automerge_check.py | 5 ++++- src/webhook_app.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/webapp/automerge_check.py b/src/webapp/automerge_check.py index 77d621361..d11fa0732 100755 --- a/src/webapp/automerge_check.py +++ b/src/webapp/automerge_check.py @@ -2,6 +2,7 @@ import collections import subprocess +import requests import stat import yaml import sys @@ -220,8 +221,10 @@ def get_organizations_at_version(sha): return set( p.get("Organization") for p in projects ) def get_invalid_institution_ids(sha, fnames): + valid_institutions = requests.get('https://topology-institutions.osg-htc.org/api/institution_ids').json() + institution_ids = [i['id'] for i in valid_institutions] projects = { fname : parse_yaml_at_version(sha, fname, {}) for fname in fnames } - return [fname for fname, yaml in projects.items() if not yaml.get("InstitutionID", "").startswith("https://osg-htc.org/iid/")] + return [fname for fname, yaml in projects.items() if not yaml.get("InstitutionID", "") in institution_ids] def commit_is_merged(sha_a, sha_b): diff --git a/src/webhook_app.py b/src/webhook_app.py index cb00417d9..1cdee7239 100755 --- a/src/webhook_app.py +++ b/src/webhook_app.py @@ -285,13 +285,14 @@ def pull_request_hook(): set_webhook_pr_state(pull_num, head_sha, webhook_state) # only comment on errors if DT files modified or contact unknown + osg_bot_msg = "No reported errors" if ret in reportable_errors: osg_bot_msg = webhook_status_messages.automerge_status_messages[ret] body = osg_bot_msg.format(**locals()) action = 'REQUEST_CHANGES' if ret in rejectable_errors else 'COMMENT' publish_pr_review(pull_num, body, action, head_sha) - return Response('Thank You') + return Response(f'Thank You: {osg_bot_msg}') def runcmd(cmd, input=None, **kw): From 8b672668228f14dcb2af71f47b2ad85e6b395dd3 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 7 Jun 2024 14:45:08 -0500 Subject: [PATCH 39/63] Use variable for institutions api url --- src/webapp/automerge_check.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/webapp/automerge_check.py b/src/webapp/automerge_check.py index d11fa0732..1101c609b 100755 --- a/src/webapp/automerge_check.py +++ b/src/webapp/automerge_check.py @@ -9,6 +9,8 @@ import os import re +from webapp.models import GlobalData + try: from urllib.request import urlopen except ImportError: @@ -21,6 +23,8 @@ import xml.etree.ElementTree as et +INSTITUTIONS_API = GlobalData().config.get('INSTITUTIONS_API') +INSTITUTIONS_TLD = INSTITUTIONS_API.replace('/api','') # direct users to homepage rather than api # NOTE: throughout this program, git shas are of type str, while paths and # filenames are of type bytes. The motivation behind this is to handle @@ -131,10 +135,11 @@ def main(args): for org in sorted(orgs_added): errors += ["New Organization '%s' requires OSG approval" % org] invalid_institutions = get_invalid_institution_ids(head, updated_projects) - errors += [ - f"Invalid InstitutionID in project(s) {invalid_institutions.join(', ')}.\n" - f"Please see https://topology-institutions.osg-htc.org for valid ID list." - ] + if invalid_institutions: + errors += [ + f"Unrecognized InstitutionID in project(s) {', '.join(invalid_institutions)}. " + f"See {INSTITUTIONS_TLD} for known ID list." + ] else: orgs_added = None invalid_institutions = None @@ -221,7 +226,7 @@ def get_organizations_at_version(sha): return set( p.get("Organization") for p in projects ) def get_invalid_institution_ids(sha, fnames): - valid_institutions = requests.get('https://topology-institutions.osg-htc.org/api/institution_ids').json() + valid_institutions = requests.get(f'{INSTITUTIONS_API}/institution_ids').json() institution_ids = [i['id'] for i in valid_institutions] projects = { fname : parse_yaml_at_version(sha, fname, {}) for fname in fnames } return [fname for fname, yaml in projects.items() if not yaml.get("InstitutionID", "") in institution_ids] From 9458e9be8aae9345fb5ac67a0df2de25e56b6fa1 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 7 Jun 2024 14:51:02 -0500 Subject: [PATCH 40/63] update new_org_rejected status message --- src/webapp/webhook_status_messages.py | 2 +- src/webhook_app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webapp/webhook_status_messages.py b/src/webapp/webhook_status_messages.py index 50e7c7726..b8f8f8d27 100644 --- a/src/webapp/webhook_status_messages.py +++ b/src/webapp/webhook_status_messages.py @@ -76,7 +76,7 @@ "Thank you for your pull request.\n" "\n" "Your [requested changes]({base_sha}...{head_sha}) add a new organization" - " to a project file; this requires manual review from OSG Staff.\n" + " or project ID to a project file; this requires manual review from OSG Staff.\n" "\n" "-- OSG-BOT :oncoming_police_car:\n" "\n" diff --git a/src/webhook_app.py b/src/webhook_app.py index 1cdee7239..b3cd4cfd8 100755 --- a/src/webhook_app.py +++ b/src/webhook_app.py @@ -292,7 +292,7 @@ def pull_request_hook(): action = 'REQUEST_CHANGES' if ret in rejectable_errors else 'COMMENT' publish_pr_review(pull_num, body, action, head_sha) - return Response(f'Thank You: {osg_bot_msg}') + return Response(f'Thank You') def runcmd(cmd, input=None, **kw): From cc2edfaea0802f781b000aaad7ad5ab83b198dab Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 7 Jun 2024 15:31:39 -0500 Subject: [PATCH 41/63] remove variable for institution ID since relative imports don't work based on the script's invocation method --- src/webapp/automerge_check.py | 11 ++++------- src/webhook_app.py | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/webapp/automerge_check.py b/src/webapp/automerge_check.py index 1101c609b..969d4d103 100755 --- a/src/webapp/automerge_check.py +++ b/src/webapp/automerge_check.py @@ -9,8 +9,6 @@ import os import re -from webapp.models import GlobalData - try: from urllib.request import urlopen except ImportError: @@ -23,8 +21,7 @@ import xml.etree.ElementTree as et -INSTITUTIONS_API = GlobalData().config.get('INSTITUTIONS_API') -INSTITUTIONS_TLD = INSTITUTIONS_API.replace('/api','') # direct users to homepage rather than api +INSTITUTIONS_API = "https://topology-institutions.osg-htc.org" # NOTE: throughout this program, git shas are of type str, while paths and # filenames are of type bytes. The motivation behind this is to handle @@ -138,7 +135,7 @@ def main(args): if invalid_institutions: errors += [ f"Unrecognized InstitutionID in project(s) {', '.join(invalid_institutions)}. " - f"See {INSTITUTIONS_TLD} for known ID list." + f"See {INSTITUTIONS_API} for known ID list." ] else: orgs_added = None @@ -226,10 +223,10 @@ def get_organizations_at_version(sha): return set( p.get("Organization") for p in projects ) def get_invalid_institution_ids(sha, fnames): - valid_institutions = requests.get(f'{INSTITUTIONS_API}/institution_ids').json() + valid_institutions = requests.get(f'{INSTITUTIONS_API}/api/institution_ids').json() institution_ids = [i['id'] for i in valid_institutions] projects = { fname : parse_yaml_at_version(sha, fname, {}) for fname in fnames } - return [fname for fname, yaml in projects.items() if not yaml.get("InstitutionID", "") in institution_ids] + return [fname.decode() for fname, yaml in projects.items() if not yaml.get("InstitutionID", "") in institution_ids] def commit_is_merged(sha_a, sha_b): diff --git a/src/webhook_app.py b/src/webhook_app.py index b3cd4cfd8..cb00417d9 100755 --- a/src/webhook_app.py +++ b/src/webhook_app.py @@ -285,14 +285,13 @@ def pull_request_hook(): set_webhook_pr_state(pull_num, head_sha, webhook_state) # only comment on errors if DT files modified or contact unknown - osg_bot_msg = "No reported errors" if ret in reportable_errors: osg_bot_msg = webhook_status_messages.automerge_status_messages[ret] body = osg_bot_msg.format(**locals()) action = 'REQUEST_CHANGES' if ret in rejectable_errors else 'COMMENT' publish_pr_review(pull_num, body, action, head_sha) - return Response(f'Thank You') + return Response('Thank You') def runcmd(cmd, input=None, **kw): From a736a14f1410ee604b1da06d07330b09e06acef5 Mon Sep 17 00:00:00 2001 From: Steve Anthony Date: Mon, 10 Jun 2024 11:16:43 -0400 Subject: [PATCH 42/63] Update Lehigh - Hawk_downtime.yaml Added downtime for CE for major version OS/OSG updates. --- .../Lehigh - Hawk/Lehigh - Hawk_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml index 151fa610e..39d0b27d5 100644 --- a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml +++ b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml @@ -97,4 +97,15 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1830324854 + Description: Upgrade CE from CentOS 7 to Alma 9 and OSG from 3.6 to 23 + Severity: Outage + StartTime: Jun 12, 2024 13:00 +0000 + EndTime: Jun 13, 2024 16:00 +0000 + CreatedTime: Jun 10, 2024 15:14 +0000 + ResourceName: LEHIGH-HAWK-CE + Services: + - CE +# --------------------------------------------------------- From c509022338969a4c5f32cf55f41c6e084f506b0b Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 10 Jun 2024 09:57:20 -0700 Subject: [PATCH 43/63] Add downtime for HOUSTON2_INTERNET2_OSDF_CACHE due to HW issues Add downtime for HOUSTON2_INTERNET2_OSDF_CACHE due to HW issues --- .../I2HoustonInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml index d36876069..feb66ae13 100644 --- a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml +++ b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure_downtime.yaml @@ -9,3 +9,14 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1830385994 + Description: HW issues + Severity: Outage + StartTime: Jun 10, 2024 08:01 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 10, 2024 16:56 +0000 + ResourceName: HOUSTON2_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From a5c93f117e3f8fe820bfe74a8c2f62d425d089bd Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 10 Jun 2024 12:29:28 -0700 Subject: [PATCH 44/63] Fixing inst name Fixing inst name --- .../National Fusion Facility/FDP-OSDF.yaml | 0 .../National Fusion Facility/SITE.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename topology/{DIII-D => DIII-D National Fusion Facility}/National Fusion Facility/FDP-OSDF.yaml (100%) rename topology/{DIII-D => DIII-D National Fusion Facility}/National Fusion Facility/SITE.yaml (100%) diff --git a/topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml b/topology/DIII-D National Fusion Facility/National Fusion Facility/FDP-OSDF.yaml similarity index 100% rename from topology/DIII-D/National Fusion Facility/FDP-OSDF.yaml rename to topology/DIII-D National Fusion Facility/National Fusion Facility/FDP-OSDF.yaml diff --git a/topology/DIII-D/National Fusion Facility/SITE.yaml b/topology/DIII-D National Fusion Facility/National Fusion Facility/SITE.yaml similarity index 100% rename from topology/DIII-D/National Fusion Facility/SITE.yaml rename to topology/DIII-D National Fusion Facility/National Fusion Facility/SITE.yaml From 1ff00f90cec6d20969231d23c9d46ebeb6c88139 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 10 Jun 2024 13:48:33 -0700 Subject: [PATCH 45/63] Add downtime for AMSTERDAM_ESNET_OSDF_CACHE due to toPelican Add downtime for AMSTERDAM_ESNET_OSDF_CACHE due to toPelican --- .../Amsterdam/EsnetAmsterdam_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml diff --git a/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml new file mode 100644 index 000000000..e98d4ea5d --- /dev/null +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1830524787 + Description: '#toPelican' + Severity: Outage + StartTime: Jun 10, 2024 08:00 +0000 + EndTime: Jun 15, 2024 06:59 +0000 + CreatedTime: Jun 10, 2024 20:47 +0000 + ResourceName: AMSTERDAM_ESNET_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 4a1fdb886560148c28b7c3fa44f10a81745a8cfc Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 10 Jun 2024 12:39:55 -0500 Subject: [PATCH 46/63] Add SWT2 k8s cluster Per discussion with Armen. Separately, I completely made up the FQDN as it shouldn't matter for this use case. --- .../SWT2 ATLAS UTA/SWT2_CPB.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml index a2dcf0b85..ee001ec22 100644 --- a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml +++ b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml @@ -264,4 +264,42 @@ Resources: endpoint: psuta01.atlas-swt2.org VOOwnership: ATLAS: 100 + SWT2_CPB_K8S: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: 4884a2d919bc5079022317a8403f84a117f2d25b + Name: Armen Vartapetian + Secondary: + ID: 85358c47f16fad2a915da157353581016788a30a + Name: Mark Sosebee + Security Contact: + Primary: + ID: 4884a2d919bc5079022317a8403f84a117f2d25b + Name: Armen Vartapetian + Secondary: + ID: 85358c47f16fad2a915da157353581016788a30a + Name: Mark Sosebee + Description: ATLAS Tier2 Kubernetes queue + FQDN: cpb-k8s.atlas-swt2.org # placeholder + Services: + CE: + Description: Compute Element + Details: + hidden: false + VOOwnership: + ATLAS: 100 + WLCGInformation: + APELNormalFactor: 12.52 + AccountingName: US-SWT2 + HEPSPEC: 102816 + InteropAccounting: true + InteropBDII: true + InteropMonitoring: true + KSI2KMax: 2086 + KSI2KMin: 2086 + StorageCapacityMax: 5000 + StorageCapacityMin: 5000 + TapeCapacity: 0 SupportCenter: USATLAS From 3971252d5ab4eb66931b96d3e458568a1d797427 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 11 Jun 2024 09:41:44 -0500 Subject: [PATCH 47/63] Fix Armen's ID --- .../SWT2 ATLAS UTA/SWT2_CPB.yaml | 4 ++-- virtual-organizations/REPORTING_GROUPS.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml index ee001ec22..5615ea703 100644 --- a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml +++ b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml @@ -269,14 +269,14 @@ Resources: ContactLists: Administrative Contact: Primary: - ID: 4884a2d919bc5079022317a8403f84a117f2d25b + ID: OSG1000710 Name: Armen Vartapetian Secondary: ID: 85358c47f16fad2a915da157353581016788a30a Name: Mark Sosebee Security Contact: Primary: - ID: 4884a2d919bc5079022317a8403f84a117f2d25b + ID: OSG1000710 Name: Armen Vartapetian Secondary: ID: 85358c47f16fad2a915da157353581016788a30a diff --git a/virtual-organizations/REPORTING_GROUPS.yaml b/virtual-organizations/REPORTING_GROUPS.yaml index 8b9fcbe89..1503d09de 100644 --- a/virtual-organizations/REPORTING_GROUPS.yaml +++ b/virtual-organizations/REPORTING_GROUPS.yaml @@ -141,7 +141,7 @@ atlas: Name: Joel Snow - ID: a688fe1904cfc91c2c5529eb898a13f9ebfbadbe Name: Xin Zhao - - ID: 4884a2d919bc5079022317a8403f84a117f2d25b + - ID: OSG1000710 Name: Armen Vartapetian FQANs: - GroupName: /atlas From 1279ddefd594fd53d4977345c3bd1170f614f72f Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 11 Jun 2024 13:29:34 -0500 Subject: [PATCH 48/63] Fixup service type --- .../SWT2 ATLAS UTA/SWT2_CPB.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml index 5615ea703..e638ff293 100644 --- a/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml +++ b/topology/University of Texas Arlington/SWT2 ATLAS UTA/SWT2_CPB.yaml @@ -284,8 +284,8 @@ Resources: Description: ATLAS Tier2 Kubernetes queue FQDN: cpb-k8s.atlas-swt2.org # placeholder Services: - CE: - Description: Compute Element + Execution Endpoint: + Description: Container-based ATLAS PanDA pilots Details: hidden: false VOOwnership: From 95c6afcdafc4b8797b29d7b1094a258a1ddb952f Mon Sep 17 00:00:00 2001 From: Brian Bockelman Date: Tue, 11 Jun 2024 14:55:12 -0500 Subject: [PATCH 49/63] Disable directory listings that are causing redirect failures due to 7.8.4 bug --- virtual-organizations/GLOW.yaml | 2 +- virtual-organizations/OSG.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/virtual-organizations/GLOW.yaml b/virtual-organizations/GLOW.yaml index b32510ff8..93301fbf3 100644 --- a/virtual-organizations/GLOW.yaml +++ b/virtual-organizations/GLOW.yaml @@ -123,7 +123,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://origin-auth2000.chtc.wisc.edu:1095 - DirList: https://origin-auth2000.chtc.wisc.edu:1095 + #DirList: https://origin-auth2000.chtc.wisc.edu:1095 CredentialGeneration: BasePath: /chtc Strategy: OAuth2 diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 1c32fbf01..cdb5916d4 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -153,7 +153,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap20.uc.osg-htc.org:1095 - DirList: https://ap20.uc.osg-htc.org:1095 + #DirList: https://ap20.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -170,7 +170,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap21.uc.osg-htc.org:1095 - DirList: https://ap21.uc.osg-htc.org:1095 + #DirList: https://ap21.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -187,7 +187,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap22.uc.osg-htc.org:1095 - DirList: https://ap22.uc.osg-htc.org:1095 + #DirList: https://ap22.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -204,7 +204,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ospool-ap2140.chtc.wisc.edu:8443 - DirList: https://ospool-ap2140.chtc.wisc.edu:8443 + #DirList: https://ospool-ap2140.chtc.wisc.edu:8443 CredentialGeneration: Strategy: OAuth2 Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 @@ -252,7 +252,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap23.uc.osg-htc.org:1095 - DirList: https://ap23.uc.osg-htc.org:1095 + #DirList: https://ap23.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool/uc-shared From 24d51fe3e7dab77341e9164b6b4088f95fcba79e Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 11 Jun 2024 16:02:17 -0700 Subject: [PATCH 50/63] Add downtime for FNAL_OSDF_ORIGIN due to Testing the pelican sw Add downtime for FNAL_OSDF_ORIGIN due to Testing the pelican sw --- .../FermiGrid/FNAL_OSDF_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml new file mode 100644 index 000000000..f2bf32508 --- /dev/null +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1831468972 + Description: Testing the pelican sw + Severity: Outage + StartTime: Jun 11, 2024 08:00 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 11, 2024 23:01 +0000 + ResourceName: FNAL_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- From 6e6ef8f0361223d3bbf868e5cae9263d2b612537 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 12 Jun 2024 10:00:25 -0500 Subject: [PATCH 51/63] =?UTF-8?q?Revert=20"Disable=20directory=20listings?= =?UTF-8?q?=20that=20are=20causing=20redirect=20failures=20due=20to=20?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- virtual-organizations/GLOW.yaml | 2 +- virtual-organizations/OSG.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/virtual-organizations/GLOW.yaml b/virtual-organizations/GLOW.yaml index 93301fbf3..b32510ff8 100644 --- a/virtual-organizations/GLOW.yaml +++ b/virtual-organizations/GLOW.yaml @@ -123,7 +123,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://origin-auth2000.chtc.wisc.edu:1095 - #DirList: https://origin-auth2000.chtc.wisc.edu:1095 + DirList: https://origin-auth2000.chtc.wisc.edu:1095 CredentialGeneration: BasePath: /chtc Strategy: OAuth2 diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index cdb5916d4..1c32fbf01 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -153,7 +153,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap20.uc.osg-htc.org:1095 - #DirList: https://ap20.uc.osg-htc.org:1095 + DirList: https://ap20.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -170,7 +170,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap21.uc.osg-htc.org:1095 - #DirList: https://ap21.uc.osg-htc.org:1095 + DirList: https://ap21.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -187,7 +187,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap22.uc.osg-htc.org:1095 - #DirList: https://ap22.uc.osg-htc.org:1095 + DirList: https://ap22.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool @@ -204,7 +204,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ospool-ap2140.chtc.wisc.edu:8443 - #DirList: https://ospool-ap2140.chtc.wisc.edu:8443 + DirList: https://ospool-ap2140.chtc.wisc.edu:8443 CredentialGeneration: Strategy: OAuth2 Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 @@ -252,7 +252,7 @@ DataFederations: AllowedCaches: - ANY Writeback: https://ap23.uc.osg-htc.org:1095 - #DirList: https://ap23.uc.osg-htc.org:1095 + DirList: https://ap23.uc.osg-htc.org:1095 CredentialGeneration: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool/uc-shared From 34b711660c1ba2e449a4a43629ef8718ef980095 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 12 Jun 2024 10:42:07 -0500 Subject: [PATCH 52/63] Unregister the UChicago .well-known directories /ospool/ap20/.well-known, /ospool/ap21/.well-known, /ospool/ap22/.well-known These registrations confuse Pelican; fortunately the registrations are unnecessary because the directories are served by an xrootd service that has a manually configured Authfile, and they are not cached. --- virtual-organizations/OSG.yaml | 52 ++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 1c32fbf01..973f2fec5 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -210,32 +210,36 @@ DataFederations: Issuer: https://ospool-ap2140.chtc.wisc.edu:8443 MaxScopeDepth: 4 - # SciTokens issuer for ap20 - - Path: /ospool/ap20/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap20 - # Do not cache this: direct access only - AllowedCaches: [] + ### These scitokens issuers are intentionally unregistered: the xrootd + ### service serving them does not pull config from Topology, and the + ### data is not meant to be cached. - # SciTokens issuer for ap21 - - Path: /ospool/ap21/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap21 - # Do not cache this: direct access only - AllowedCaches: [] + # # SciTokens issuer for ap20 + # - Path: /ospool/ap20/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap20 + # # Do not cache this: direct access only + # AllowedCaches: [] - # SciTokens issuer for ap22 - - Path: /ospool/ap22/.well-known - Authorizations: - - PUBLIC - AllowedOrigins: - - UChicago_OSGConnect_ap22 - # Do not cache this: direct access only - AllowedCaches: [] + # # SciTokens issuer for ap21 + # - Path: /ospool/ap21/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap21 + # # Do not cache this: direct access only + # AllowedCaches: [] + + # # SciTokens issuer for ap22 + # - Path: /ospool/ap22/.well-known + # Authorizations: + # - PUBLIC + # AllowedOrigins: + # - UChicago_OSGConnect_ap22 + # # Do not cache this: direct access only + # AllowedCaches: [] - Path: /ospool/uc-shared/project Authorizations: From 200c51d4f49c599f4929d36788e5859422691ee0 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Wed, 12 Jun 2024 08:49:42 -0700 Subject: [PATCH 53/63] New project: Illinois_Goyal --- projects/Illinois_Goyal.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/Illinois_Goyal.yaml diff --git a/projects/Illinois_Goyal.yaml b/projects/Illinois_Goyal.yaml new file mode 100644 index 000000000..ab92d457a --- /dev/null +++ b/projects/Illinois_Goyal.yaml @@ -0,0 +1,8 @@ +Department: Computer Science +Description: Diverse set of projects focusing on vision models/LLMs primarily falling + under the umbrella terms of "machine unlearning" and "human-AI alignment" +FieldOfScience: Computer Science +FieldOfScienceID: '11.0701' +InstitutionID: https://osg-htc.org/iid/10izzs5e7v1r +Organization: University of Illinois Urbana-Champaign +PIName: Agam Goyal From 073f8bc7d48ddc5a171636d5c805d8a952eb5320 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 12 Jun 2024 11:43:18 -0500 Subject: [PATCH 54/63] Use COManage ID for Nathan Crawford --- topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml | 4 ++-- .../UC Irvine/UCIT3/University of California Irvine.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml index 718212549..11f3458bb 100644 --- a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml +++ b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml @@ -16,7 +16,7 @@ Resources: Name: Diego Davila Site Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: SLATE deployed Hosted CE for the GPAtlas Cluster FQDN: hosted-ce40.opensciencegrid.org @@ -39,7 +39,7 @@ Resources: Name: Diego Davila Site Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: SLATE deployed Hosted CE for the GPAtlas Cluster FQDN: uci-gpatlas-ce1.svc.opensciencegrid.org diff --git a/topology/UC Irvine/UCIT3/University of California Irvine.yaml b/topology/UC Irvine/UCIT3/University of California Irvine.yaml index 469664b10..d64630a2a 100644 --- a/topology/UC Irvine/UCIT3/University of California Irvine.yaml +++ b/topology/UC Irvine/UCIT3/University of California Irvine.yaml @@ -14,7 +14,7 @@ Resources: Name: Anyes Taffard Local Operational Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Active: true Description: UCI gridftp and LHC @ UC glidein scheduler submit host. @@ -52,7 +52,7 @@ Resources: Name: Jeffrey Michael Dost Local Operational Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-1.ps.uci.edu @@ -87,7 +87,7 @@ Resources: Name: Jeffrey Michael Dost Local Operational Contact: Primary: - ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + ID: OSG1000711 Name: Nathan Crawford Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-2.ps.uci.edu From aa596c85eb9e0d6827dd99eccc7ede4b6ff7d6dc Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Wed, 12 Jun 2024 13:32:52 -0700 Subject: [PATCH 55/63] Update University of California Irvine.yaml Deactivate resource UCI_ATLAS_GRIDFTP Deactivate resource UCLHC IRVINE SUBMIT HOST Add Nathan Crawford as Tertiary Admin for UCIT3-AP2 Add resources UCIT3-AP1, UCIT3-AP3, and UCIT3-AP4 Rearrange fields to match template-resourcegroup Remove vestigial ID and GroupID fields --- .../University of California Irvine.yaml | 130 ++++++++++++++++-- 1 file changed, 122 insertions(+), 8 deletions(-) diff --git a/topology/UC Irvine/UCIT3/University of California Irvine.yaml b/topology/UC Irvine/UCIT3/University of California Irvine.yaml index d64630a2a..e97693754 100644 --- a/topology/UC Irvine/UCIT3/University of California Irvine.yaml +++ b/topology/UC Irvine/UCIT3/University of California Irvine.yaml @@ -1,7 +1,9 @@ -GroupDescription: UCI ATLAS Tier-3 -GroupID: 287 Production: true +SupportCenter: USATLAS +GroupDescription: UCI ATLAS Tier-3 + Resources: +#Archived Resources (inactive) UCI_ATLAS_GRIDFTP: ContactLists: Security Contact: @@ -16,7 +18,7 @@ Resources: Primary: ID: OSG1000711 Name: Nathan Crawford - Active: true + Active: false Description: UCI gridftp and LHC @ UC glidein scheduler submit host. FQDN: gpatlas2.ps.uci.edu DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas2.ps.uci.edu @@ -34,7 +36,7 @@ Resources: ATLAS: 100 UCLHC IRVINE SUBMIT HOST: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -67,9 +69,51 @@ Resources: - OSPool VOOwnership: ATLAS: 100 - + +#Active Resources +UCIT3-AP1: + Active: true + Description: UCI ATLAS Access Point 1. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: uclhc-1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-1.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + ATLAS: 100 + UCIT3-AP2: Active: true + Description: UCI ATLAS Access Point 2. ContactLists: Administrative Contact: Primary: @@ -78,6 +122,9 @@ Resources: Secondary: ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford Security Contact: Primary: ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f @@ -89,10 +136,8 @@ Resources: Primary: ID: OSG1000711 Name: Nathan Crawford - Description: LHC @ UC glidein scheduler submit host. FQDN: uclhc-2.ps.uci.edu DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=uclhc-2.ps.uci.edu - ID: 1209 Services: Submit Node: Description: OS Pool access point @@ -100,4 +145,73 @@ Resources: - OSPool VOOwnership: ATLAS: 100 -SupportCenter: USATLAS + + UCIT3-AP3: + Active: true + Description: UCI ATLAS Access Point 3. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: gpatlas1.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas1.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Tags: + - OSPool + VOOwnership: + ATLAS: 100 + + UCIT3-AP4: + Active: true + Description: UCI ATLAS Access Point 4. + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Tertiary: + ID: OSG1000711 + Name: Nathan Crawford + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Secondary: + ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba + Name: Jeffrey Michael Dost + Local Operational Contact: + Primary: + ID: OSG1000711 + Name: Nathan Crawford + FQDN: gpatlas2.ps.uci.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=University of California, Irvine/CN=gpatlas2.ps.uci.edu + Services: + Submit Node: + Description: OS Pool access point + Tags: + - OSPool + VOOwnership: + ATLAS: 100 From b02d940b8395c13ef9d4bed48c3341b37fdb8f66 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Wed, 12 Jun 2024 13:44:46 -0700 Subject: [PATCH 56/63] Update University of California Irvine.yaml Indent UCIT3-AP2 properly --- topology/UC Irvine/UCIT3/University of California Irvine.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/UC Irvine/UCIT3/University of California Irvine.yaml b/topology/UC Irvine/UCIT3/University of California Irvine.yaml index e97693754..87c00ca7e 100644 --- a/topology/UC Irvine/UCIT3/University of California Irvine.yaml +++ b/topology/UC Irvine/UCIT3/University of California Irvine.yaml @@ -71,7 +71,7 @@ Resources: ATLAS: 100 #Active Resources -UCIT3-AP1: + UCIT3-AP1: Active: true Description: UCI ATLAS Access Point 1. ContactLists: From ec3196df16075bf15e6e57c5088a27fd2eab7776 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 13 Jun 2024 14:51:55 -0700 Subject: [PATCH 57/63] Add downtime for NEBRASKA_NRP_OSDF_ORIGIN due to OS testing Add downtime for NEBRASKA_NRP_OSDF_ORIGIN due to OS testing --- .../Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml new file mode 100644 index 000000000..e3b5e94e6 --- /dev/null +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLNRPOrigin_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1833154607 + Description: Testing OS + Severity: Outage + StartTime: Jun 12, 2024 19:30 +0000 + EndTime: Jun 21, 2024 19:30 +0000 + CreatedTime: Jun 13, 2024 21:51 +0000 + ResourceName: NEBRASKA_NRP_OSDF_ORIGIN + Services: + - XRootD origin server +# --------------------------------------------------------- From 1d9b90aa208f49da004c02c19662dc599ffef033 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Mon, 17 Jun 2024 13:40:53 -0500 Subject: [PATCH 58/63] Activate HPC4L resources This was keeping the site from showing up in GGUS --- .../HPC For Lebanon/HPC4L.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml b/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml index f709a147e..5e162dcfa 100644 --- a/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml +++ b/topology/American University of Beirut/HPC For Lebanon/HPC4L.yaml @@ -2,7 +2,7 @@ GroupDescription: "HPC4L initiative (https://hpc4l-webpage.web.cern.ch/)" Production: true Resources: HPC4L-CE: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -33,7 +33,7 @@ Resources: StorageCapacityMax: 0 StorageCapacityMin: 0 HPC4L-SE: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -62,7 +62,7 @@ Resources: StorageCapacityMax: 8.2 StorageCapacityMin: 1 HPC4L-SE-2: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -91,7 +91,7 @@ Resources: StorageCapacityMax: 8.2 StorageCapacityMin: 1 HPC4L-Squid: - Active: false + Active: true ContactLists: Administrative Contact: Primary: From 7f79a48fda371cb3a682ef3d88a479196d9716a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 23:24:45 +0000 Subject: [PATCH 59/63] Bump urllib3 in /.github/scripts/check_project_fos_precision Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/2.2.1...2.2.2) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/scripts/check_project_fos_precision/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check_project_fos_precision/requirements.txt b/.github/scripts/check_project_fos_precision/requirements.txt index 96082b7ff..4fe64646f 100644 --- a/.github/scripts/check_project_fos_precision/requirements.txt +++ b/.github/scripts/check_project_fos_precision/requirements.txt @@ -9,4 +9,4 @@ PyYAML==6.0.1 requests==2.32.0 six==1.16.0 tzdata==2024.1 -urllib3==2.2.1 +urllib3==2.2.2 From 421c194c39de1e0d74c80b018d8c3c2bd054efae Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 17 Jun 2024 19:24:35 -0700 Subject: [PATCH 60/63] node removed from NRP node removed from NRP --- .../NRP/MGHPCCCachingInfrastructure.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml index da4d1f9b2..714e0e383 100644 --- a/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml +++ b/topology/Massachusetts Green High Performance Computing Center/NRP/MGHPCCCachingInfrastructure.yaml @@ -4,7 +4,7 @@ GroupDescription: Caching infrastructure in MGHPCC GroupID: 1318 Resources: MGHPCC_NRP_OSDF_CACHE: - Active: true + Active: false Description: MGHPCC NRP OSDF Cache ID: 1348 ContactLists: From ef759f3e1e891212ae24f9f2957689a87f391517 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 17 Jun 2024 19:34:08 -0700 Subject: [PATCH 61/63] adding FDP_OSDF_ORIGIN namespace adding FDP_OSDF_ORIGIN namespace --- virtual-organizations/NRP.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/virtual-organizations/NRP.yaml b/virtual-organizations/NRP.yaml index 4010b14b3..f275f0b11 100644 --- a/virtual-organizations/NRP.yaml +++ b/virtual-organizations/NRP.yaml @@ -65,7 +65,7 @@ DataFederations: Authorizations: - PUBLIC - SciTokens: - Issuer: https://t.nationalresearchplatform.org/fdp + Issuer: https://t.nationalresearchplatform.org/fdp-d3d Base Path: /nrp/fdp/ Map Subject: False AllowedOrigins: @@ -101,3 +101,14 @@ DataFederations: - SDSC_NRP_OSDF_ORIGIN AllowedCaches: - ANY + - Path: /fdp-d3d + Authorizations: + - PUBLIC + - SciTokens: + Issuer: https://t.nationalresearchplatform.org/fdp-d3d + Base Path: /fdp-d3d + Map Subject: False + AllowedOrigins: + - FDP_OSDF_ORIGIN + AllowedCaches: + - ANY From fcdfd59d3e6a1ad5aa9f99ab1eecc25e901c23d0 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 18 Jun 2024 13:13:39 -0700 Subject: [PATCH 62/63] adding sdsc-xenon-origin --- .../SDSC-NRP.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 669ec23b6..074016f48 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 @@ -51,6 +51,26 @@ Resources: AllowedVOs: - ANY + SDSC_NRP_OSDF_XENON_ORIGIN: + Active: true + Description: SDSC NRP OSDF Xenon Origin + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Security Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + DN: /CN=sdsc-xenon-origin.nationalresearchplatform.org + FQDN: sdsc-xenon-origin.nationalresearchplatform.org + Services: + XRootD origin server: + Description: SDSC NRP OSDF Xenon Origin + AllowedVOs: + - ANY + SDSC_NRP_OSDF_S3_ORIGIN: Active: true Description: SDSC NRP OSDF S3 Origin From af4df35c850f5727d51a51075ddd01a49e47d530 Mon Sep 17 00:00:00 2001 From: vokac Date: Wed, 19 Jun 2024 05:55:48 +0200 Subject: [PATCH 63/63] Update FZU_downtime.yaml Add downtime for FZU due to https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 --- .../FZU/FZU_downtime.yaml | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml b/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml index ac3d03e16..707d8f6c5 100644 --- a/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml +++ b/topology/Institute of Physics ASCR/FZU/FZU_downtime.yaml @@ -32,3 +32,75 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692118 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE1 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692119 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE2 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692120 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_OSG_CE3 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692121 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: FZU_STASH + Services: + - XRootD cache server +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692122 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: perfSONAR_FZU_bandwidth + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1837692123 + Description: See https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35391 and + https://goc.egi.eu/portal/index.php?Page_Type=Downtime&id=35395 + Severity: Outage + StartTime: Jun 14, 2024 12:00 +0000 + EndTime: Jun 21, 2024 16:00 +0000 + CreatedTime: Jun 19, 2024 03:53 +0000 + ResourceName: perfSONAR_FZU_latency + Services: + - net.perfSONAR.Latency +# ---------------------------------------------------------