From 0145d5ee9ebd8cce34247668370762a3e6a9a124 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Wed, 18 Jan 2023 15:54:43 -0600 Subject: [PATCH 001/184] Create Institution Endpoint (SOFTWARE-5443) Add Institution Endpoint Add Tests for Institution Endpoint --- src/app.py | 17 ++++++++++++- src/tests/test_api.py | 55 ++++++++++++++++++++++++++++++++++++++++++- src/webapp/common.py | 43 ++++++++++++++++++++++++++++----- 3 files changed, 107 insertions(+), 8 deletions(-) diff --git a/src/app.py b/src/app.py index 352407cba..aa1145fd4 100755 --- a/src/app.py +++ b/src/app.py @@ -14,7 +14,7 @@ import urllib.parse from webapp import default_config -from webapp.common import readfile, to_xml_bytes, to_json_bytes, Filters, support_cors, simplify_attr_list, is_null, escape +from webapp.common import readfile, to_xml_bytes, to_json_bytes, Filters, support_cors, simplify_attr_list, is_null, escape, create_accepted_response from webapp.exceptions import DataError, ResourceNotRegistered, ResourceMissingService from webapp.forms import GenerateDowntimeForm, GenerateResourceGroupDowntimeForm from webapp.models import GlobalData @@ -224,6 +224,21 @@ def contacts(): app.log_exception(sys.exc_info()) return Response("Error getting users", status=503) # well, it's better than crashing +@app.route('/api/institutions') +def institutions(): + + resource_facilities = set(global_data.get_topology().facilities.keys()) + project_facilities = set(x['Organization'] for x in global_data.get_projects()['Projects']['Project']) + + facilities = project_facilities.union(resource_facilities) + + facility_data = [["Institution Name", "Has Resource(s)", "Has Project(s)"]] + for facility in sorted(facilities): + facility_data.append([facility, facility in resource_facilities, facility in project_facilities]) + + return create_accepted_response(facility_data, request.headers, default="text/csv") + + @app.route('/miscproject/xml') def miscproject_xml(): diff --git a/src/tests/test_api.py b/src/tests/test_api.py index bb16ec01d..dbb3cb7c4 100644 --- a/src/tests/test_api.py +++ b/src/tests/test_api.py @@ -6,6 +6,8 @@ # Rewrites the path so the app can be imported like it normally is import os import sys +import csv +import io topdir = os.path.join(os.path.dirname(__file__), "..") sys.path.append(topdir) @@ -52,7 +54,8 @@ "/origin/Authfile", "/origin/Authfile-public", "/origin/scitokens.conf", - "/cache/scitokens.conf" + "/cache/scitokens.conf", + "/api/institutions" ] @@ -216,6 +219,19 @@ def validate_namespace_schema(ns): for cache in namespace["caches"]: validate_cache_schema(cache) + def test_institution_accept_type(self, client: flask.Flask): + """Checks both formats output the same content""" + + json_institutions = client.get("/api/institutions", headers={"Accept": "application/json"}).json + json_tuples = [tuple(map(str, x)) for x in sorted(json_institutions, key=lambda x: x[0])] + + csv_institutions = csv.reader(io.StringIO(client.get("/api/institutions").data.decode())) + csv_tuples = [tuple(x) for x in sorted(csv_institutions, key=lambda x: x[0])] + + assert len(csv_tuples) == len(json_tuples) + + assert tuple(json_tuples) == tuple(csv_tuples) + class TestEndpointContent: @@ -733,6 +749,43 @@ def test_facility_defaults(self, client: flask.Flask): # Check that the site contains the appropriate keys assert set(facilities.popitem()[1]).issuperset(["ID", "Name", "IsCCStar"]) + def test_institution_default(self, client: flask.Flask): + institutions = client.get("/api/institutions", headers={"Accept": "application/json"}).json + + assert len(institutions) > 0 + + # Check facilities exist and have the "have resources" bit flipped + assert [i for i in institutions if i[0] == "JINR"][0][1] + assert [i for i in institutions if i[0] == "Universidade de São Paulo - Laboratório de Computação Científica Avançada"][0][1] + + # Project Organizations exist and have "has project" bit flipped + assert [i for i in institutions if i[0] == "Iolani School"][0][2] + assert [i for i in institutions if i[0] == "University of California, San Diego"][0][2] + + # Both + assert [i for i in institutions if i[0] == "Harvard University"][0][1] and [i for i in institutions if i[0] == "Harvard University"][0][2] + + # Check Project only doesn't have resource bit + assert [i for i in institutions if i[0] == "National Research Council of Canada"][0][1] is False + + # Facility Tests + facilities = set(global_data.get_topology().facilities.keys()) + + # Check all facilities exist + assert set(i[0] for i in institutions).issuperset(facilities) + + # Check all facilities have their facilities bit flipped + assert all(x[1] for x in institutions if x[0] in institutions) + + # Project Tests + projects = set(x['Organization'] for x in global_data.get_projects()['Projects']['Project']) + + # Check all projects exist + assert set(i[0] for i in institutions).issuperset(projects) + + # Check all projects have the project bit flipped + assert all(x[2] for x in institutions if x[0] in projects) + if __name__ == '__main__': pytest.main() diff --git a/src/webapp/common.py b/src/webapp/common.py index eea23856a..afe6f6881 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -13,6 +13,10 @@ import xmltodict import yaml +import csv +from io import StringIO +from flask import Response + try: from yaml import CSafeLoader as SafeLoader except ImportError: @@ -53,6 +57,34 @@ def populate_voown_name(self, vo_id_to_name: Dict): self.voown_name = [vo_id_to_name.get(i, "") for i in self.voown_id] +def create_accepted_response(data: list, headers, default=None) -> Response: + """Provides CSV or JSON options for list of list(string)""" + + if not default: + default = "application/json" + + accepted_response_builders = { + "text/csv": lambda: Response(to_csv(data), mimetype="text/csv"), + "application/json": lambda: Response(to_json_bytes(data), mimetype="application/json"), + } + + requested_types = set(headers.get('Accept', 'default').replace(' ', '').split(",")) + accepted_and_requested = set(accepted_response_builders.keys()).intersection(requested_types) + + if accepted_and_requested: + return accepted_response_builders[accepted_and_requested.pop()]() + else: + return accepted_response_builders[default]() + + +def to_csv(data: list) -> str: + csv_string = StringIO() + writer = csv.writer(csv_string) + for row in data: + writer.writerow(row) + return csv_string.getvalue() + + def is_null(x, *keys) -> bool: for key in keys: if not key: continue @@ -101,7 +133,7 @@ def simplify_attr_list(data: Union[Dict, List], namekey: str, del_name: bool = T return new_data -def expand_attr_list_single(data: Dict, namekey:str, valuekey: str, name_first=True) -> List[OrderedDict]: +def expand_attr_list_single(data: Dict, namekey: str, valuekey: str, name_first=True) -> List[OrderedDict]: """ Expand {"name1": "val1", @@ -120,7 +152,8 @@ def expand_attr_list_single(data: Dict, namekey:str, valuekey: str, name_first=T return newdata -def expand_attr_list(data: Dict, namekey: str, ordering: Union[List, None]=None, ignore_missing=False) -> List[OrderedDict]: +def expand_attr_list(data: Dict, namekey: str, ordering: Union[List, None] = None, ignore_missing=False) -> List[ + OrderedDict]: """ Expand {"name1": {"attr1": "val1", ...}, @@ -263,6 +296,7 @@ def git_clone_or_pull(repo, dir, branch, ssh_key=None) -> bool: ok = ok and run_git_cmd(["checkout", branch], dir=dir) return ok + def git_clone_or_fetch_mirror(repo, git_dir, ssh_key=None) -> bool: if os.path.exists(git_dir): ok = run_git_cmd(["fetch", "origin"], git_dir=git_dir, ssh_key=ssh_key) @@ -270,7 +304,7 @@ def git_clone_or_fetch_mirror(repo, git_dir, ssh_key=None) -> bool: ok = run_git_cmd(["clone", "--mirror", repo, git_dir], ssh_key=ssh_key) # disable mirror push ok = ok and run_git_cmd(["config", "--unset", "remote.origin.mirror"], - git_dir=git_dir) + git_dir=git_dir) return ok @@ -315,17 +349,14 @@ def escape(pattern: str) -> str: unescaped_characters = ['!', '"', '%', "'", ',', '/', ':', ';', '<', '=', '>', '@', "`"] for unescaped_character in unescaped_characters: - escaped_string = re.sub(unescaped_character, f"\\{unescaped_character}", escaped_string) return escaped_string def support_cors(f): - @wraps(f) def wrapped(): - response = f() response.headers['Access-Control-Allow-Origin'] = '*' From e3b6af528e71c053bd04667c7d7e030e749350b1 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Thu, 19 Jan 2023 10:47:11 -0600 Subject: [PATCH 002/184] Create Institution Endpoint (SOFTWARE-5443) Move the create_accepted_response function --- src/app.py | 3 ++- src/webapp/common.py | 21 --------------------- src/webapp/flask_common.py | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/webapp/flask_common.py diff --git a/src/app.py b/src/app.py index aa1145fd4..90bfbe751 100755 --- a/src/app.py +++ b/src/app.py @@ -14,7 +14,8 @@ import urllib.parse from webapp import default_config -from webapp.common import readfile, to_xml_bytes, to_json_bytes, Filters, support_cors, simplify_attr_list, is_null, escape, create_accepted_response +from webapp.common import readfile, to_xml_bytes, to_json_bytes, Filters, support_cors, simplify_attr_list, is_null, escape +from webapp.flask_common import create_accepted_response from webapp.exceptions import DataError, ResourceNotRegistered, ResourceMissingService from webapp.forms import GenerateDowntimeForm, GenerateResourceGroupDowntimeForm from webapp.models import GlobalData diff --git a/src/webapp/common.py b/src/webapp/common.py index afe6f6881..872391d4c 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -15,7 +15,6 @@ import yaml import csv from io import StringIO -from flask import Response try: from yaml import CSafeLoader as SafeLoader @@ -57,26 +56,6 @@ def populate_voown_name(self, vo_id_to_name: Dict): self.voown_name = [vo_id_to_name.get(i, "") for i in self.voown_id] -def create_accepted_response(data: list, headers, default=None) -> Response: - """Provides CSV or JSON options for list of list(string)""" - - if not default: - default = "application/json" - - accepted_response_builders = { - "text/csv": lambda: Response(to_csv(data), mimetype="text/csv"), - "application/json": lambda: Response(to_json_bytes(data), mimetype="application/json"), - } - - requested_types = set(headers.get('Accept', 'default').replace(' ', '').split(",")) - accepted_and_requested = set(accepted_response_builders.keys()).intersection(requested_types) - - if accepted_and_requested: - return accepted_response_builders[accepted_and_requested.pop()]() - else: - return accepted_response_builders[default]() - - def to_csv(data: list) -> str: csv_string = StringIO() writer = csv.writer(csv_string) diff --git a/src/webapp/flask_common.py b/src/webapp/flask_common.py new file mode 100644 index 000000000..a76a800c1 --- /dev/null +++ b/src/webapp/flask_common.py @@ -0,0 +1,22 @@ +from flask import Response +from .common import to_csv, to_json_bytes + + +def create_accepted_response(data: list, headers, default=None) -> Response: + """Provides CSV or JSON options for list of list(string)""" + + if not default: + default = "application/json" + + accepted_response_builders = { + "text/csv": lambda: Response(to_csv(data), mimetype="text/csv"), + "application/json": lambda: Response(to_json_bytes(data), mimetype="application/json"), + } + + requested_types = set(headers.get('Accept', 'default').replace(' ', '').split(",")) + accepted_and_requested = set(accepted_response_builders.keys()).intersection(requested_types) + + if accepted_and_requested: + return accepted_response_builders[accepted_and_requested.pop()]() + else: + return accepted_response_builders[default]() From 19288b62029df74c2176f9b26eb8340c2d61687e Mon Sep 17 00:00:00 2001 From: Cannon Lock <49032265+CannonLock@users.noreply.github.com> Date: Wed, 25 Jan 2023 09:39:40 -0600 Subject: [PATCH 003/184] Change out the type annotation for one that is compatible with 3.6 Co-authored-by: Matyas Selmeci --- src/webapp/flask_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webapp/flask_common.py b/src/webapp/flask_common.py index a76a800c1..a5bc662d1 100644 --- a/src/webapp/flask_common.py +++ b/src/webapp/flask_common.py @@ -1,8 +1,8 @@ from flask import Response from .common import to_csv, to_json_bytes +from typing import List - -def create_accepted_response(data: list, headers, default=None) -> Response: +def create_accepted_response(data: List, headers, default=None) -> Response: """Provides CSV or JSON options for list of list(string)""" if not default: From 7fd29a2fcae1a9929e229a4581341e7407c33c52 Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Wed, 14 Jun 2023 13:58:16 -0500 Subject: [PATCH 004/184] Fix set-output GHA deprecation warning in build-client-container.yml --- .github/workflows/build-client-container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-client-container.yml b/.github/workflows/build-client-container.yml index c582a6dc3..447f12852 100644 --- a/.github/workflows/build-client-container.yml +++ b/.github/workflows/build-client-container.yml @@ -19,7 +19,7 @@ jobs: steps: - name: make date tag id: mkdatetag - run: echo "::set-output name=dtag::$(date +%Y%m%d-%H%M)" + run: echo “dtag=$(date +%Y%m%d-%H%M)” >> $GITHUB_OUTPUT build: runs-on: ubuntu-latest @@ -43,7 +43,7 @@ jobs: tag_list+=($registry/$docker_repo:release-$TIMESTAMP) done IFS=, - echo "::set-output name=taglist::${tag_list[*]}" + echo “taglist=${tag_list[*]}” >> $GITHUB_OUTPUT - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 From f14ff924d67e2d6aa3182d75b7673090de55be3e Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Wed, 14 Jun 2023 14:01:11 -0500 Subject: [PATCH 005/184] Fix set-output GHA deprecation warning in build-sw-container.yml --- .github/workflows/build-client-container.yml | 4 ++-- .github/workflows/build-sw-container.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-client-container.yml b/.github/workflows/build-client-container.yml index 447f12852..58b275387 100644 --- a/.github/workflows/build-client-container.yml +++ b/.github/workflows/build-client-container.yml @@ -19,7 +19,7 @@ jobs: steps: - name: make date tag id: mkdatetag - run: echo “dtag=$(date +%Y%m%d-%H%M)” >> $GITHUB_OUTPUT + run: echo "dtag=$(date +%Y%m%d-%H%M)" >> $GITHUB_OUTPUT build: runs-on: ubuntu-latest @@ -43,7 +43,7 @@ jobs: tag_list+=($registry/$docker_repo:release-$TIMESTAMP) done IFS=, - echo “taglist=${tag_list[*]}” >> $GITHUB_OUTPUT + echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/.github/workflows/build-sw-container.yml b/.github/workflows/build-sw-container.yml index a32327a48..d50f0d107 100644 --- a/.github/workflows/build-sw-container.yml +++ b/.github/workflows/build-sw-container.yml @@ -28,7 +28,7 @@ jobs: # This causes the tag_list array to be comma-separated below, # which is required for build-push-action IFS=, - echo "::set-output name=taglist::${tag_list[*]}" + echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 From c78fc46fe9e993e4a1db4a6d152ac6f39a580bf9 Mon Sep 17 00:00:00 2001 From: Rachel Lombardi <37351287+rachellombardi@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:49:03 -0500 Subject: [PATCH 006/184] Add Project MSKCC_Chodera --- data/MSKCC_Chodera.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 data/MSKCC_Chodera.yaml diff --git a/data/MSKCC_Chodera.yaml b/data/MSKCC_Chodera.yaml new file mode 100644 index 000000000..8614771f0 --- /dev/null +++ b/data/MSKCC_Chodera.yaml @@ -0,0 +1,5 @@ +Department: MSKCC +Description: We are developing a system to enable high throughput free energy calculations. +FieldOfScience: Bioinformatics +Organization: Memorial Sloan Kettering Cancer Center +PIName: John Chodera From e49bf168a6815d0ad5aabb1a8ef7d42a331eb8a8 Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Tue, 20 Jun 2023 09:34:47 -0500 Subject: [PATCH 007/184] Fix deprecated Node.js 12 actions with update to Node.js 16 in validate-code.yml --- .github/workflows/validate-code.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-code.yml b/.github/workflows/validate-code.yml index b1c384a31..a21c49284 100644 --- a/.github/workflows/validate-code.yml +++ b/.github/workflows/validate-code.yml @@ -6,9 +6,9 @@ jobs: name: Validate Topology code runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9.15 - name: Install packages From b4705411320715ff0b36afdc8df0e34035e3c1e6 Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Tue, 20 Jun 2023 09:37:20 -0500 Subject: [PATCH 008/184] Fix deprecated Node.js 12 actions with update to Node.js 16 in build-client-container.yml --- .github/workflows/build-client-container.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-client-container.yml b/.github/workflows/build-client-container.yml index 58b275387..a9fa60524 100644 --- a/.github/workflows/build-client-container.yml +++ b/.github/workflows/build-client-container.yml @@ -29,7 +29,7 @@ jobs: fail-fast: False steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Generate tag list id: generate-tag-list @@ -46,23 +46,23 @@ jobs: echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Log in to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Log in to OSG Harbor - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: registry: hub.opensciencegrid.org username: ${{ secrets.OSG_HARBOR_ROBOT_USER }} password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }} - name: Build and push Client Docker images - uses: docker/build-push-action@v2.2.0 + uses: docker/build-push-action@v4 with: push: true tags: "${{ steps.generate-tag-list.outputs.taglist }}" From 06cf731a05e2775e35bc799816db9ee67af20146 Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Tue, 20 Jun 2023 09:40:10 -0500 Subject: [PATCH 009/184] Fix deprecated Node.js 12 actions with update to Node.js 16 in validate-caches.yml --- .github/workflows/validate-caches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-caches.yml b/.github/workflows/validate-caches.yml index 873d9be3d..24f45d8da 100644 --- a/.github/workflows/validate-caches.yml +++ b/.github/workflows/validate-caches.yml @@ -10,9 +10,9 @@ jobs: if: startsWith(github.repository, 'opensciencegrid/') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9.15 - name: Compare StashCache config lists From 1aabd1abc5124eb4964834690622a15ecbaff23b Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Tue, 20 Jun 2023 09:44:34 -0500 Subject: [PATCH 010/184] Fix deprecated Node.js 12 actions with update to Node.js 16 in build-sw-container.yml --- .github/workflows/build-sw-container.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-sw-container.yml b/.github/workflows/build-sw-container.yml index d50f0d107..47a55cc42 100644 --- a/.github/workflows/build-sw-container.yml +++ b/.github/workflows/build-sw-container.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: startsWith(github.repository, 'opensciencegrid/') steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Generate tag list id: generate-tag-list @@ -31,23 +31,23 @@ jobs: echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Log in to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Log in to OSG Harbor - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: registry: hub.opensciencegrid.org username: ${{ secrets.OSG_HARBOR_ROBOT_USER }} password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }} - name: Build and push Docker images - uses: docker/build-push-action@v2.2.0 + uses: docker/build-push-action@v4 with: context: . push: true From 526b8a8466e42e94ede54d44775c797288e4c730 Mon Sep 17 00:00:00 2001 From: Jeff Takaki Date: Tue, 20 Jun 2023 09:46:35 -0500 Subject: [PATCH 011/184] Fix deprecated Node.js 12 actions with update to Node.js 16 in validate-data.yml --- .github/workflows/validate-data.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-data.yml b/.github/workflows/validate-data.yml index 006996364..d28b8db3c 100644 --- a/.github/workflows/validate-data.yml +++ b/.github/workflows/validate-data.yml @@ -7,9 +7,9 @@ jobs: name: Validate Topology data runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9.15 - name: Install packages From c3aec4bf07503eb9d17c024d415741e41fccfa0a Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:51:27 -0500 Subject: [PATCH 012/184] Create OHSU_Katamreddy.yaml --- projects/OHSU_Katamreddy.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 projects/OHSU_Katamreddy.yaml diff --git a/projects/OHSU_Katamreddy.yaml b/projects/OHSU_Katamreddy.yaml new file mode 100644 index 000000000..263ba5e80 --- /dev/null +++ b/projects/OHSU_Katamreddy.yaml @@ -0,0 +1,14 @@ +Description: > + Cardiovascular disease occurs due to environmental factors like diet, + exercise but also due to genetic predisposition. + I want to work on finding genetic pathways that underlie the genesis cardiovascular disease. + Please find link to my previous work on cardiovascular disease and medicine. ‪ + Adarsh Katamreddy‬ - ‪Google Scholar‬ +Department: Cardiovascular Medicine +FieldOfScience: Medical Sciences +Organization: Oregon Health & Science University +PIName: Adarsh Katamreddy + +Sponsor: + CampusGrid: + Name: OSG Connect From 3a902bacee41249c7d8ab93090fc16a03338aa67 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:04:56 -0500 Subject: [PATCH 013/184] Create PSI_Kaib.yaml --- projects/PSI_Kaib.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/PSI_Kaib.yaml diff --git a/projects/PSI_Kaib.yaml b/projects/PSI_Kaib.yaml new file mode 100644 index 000000000..1883156d9 --- /dev/null +++ b/projects/PSI_Kaib.yaml @@ -0,0 +1,8 @@ +Description: > + I will be using computer simulations to model the orbital evolution of comets and asteroids over the + lifetime of the solar system. In addition, I will be studying the stability of the solar system and Kuiper belt as + it is subjected to close flybys of other stars in the Milky Way. https://www.psi.edu/about/staffpage/nkaib +Department: Planetary Science Institute +FieldOfScience: Astronomy and Astrophysics +Organization: Planetary Science Institute +PIName: Nathan Kaib From d9d5ac267ee091a61edccb9944e4f593ea49fd81 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:08:02 -0500 Subject: [PATCH 014/184] Create CedarsSinai_Meyer.yaml --- projects/CedarsSinai_Meyer.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 projects/CedarsSinai_Meyer.yaml diff --git a/projects/CedarsSinai_Meyer.yaml b/projects/CedarsSinai_Meyer.yaml new file mode 100644 index 000000000..e53c4b900 --- /dev/null +++ b/projects/CedarsSinai_Meyer.yaml @@ -0,0 +1,10 @@ +Description: > + The Platform for Single-Cell Science is a tool for improving both the reproducibility and accessibility of analytical + pipelines developed for single-cell multiomics. Researchers will be able to upload their data, create an analysis pipeline + using our javascript designer, and link their results to a publication. The raw data, analysis, and results will be made + available for interactive exploration or download when users are ready to publish. We are hoping to understand if there + is a way we can use OSG by sending jobs that are prepared on our website hosted on AWS to the OSG for execution. +Department: Computational Biomedicine +FieldOfScience: Biological and Biomedical Sciences +Organization: Cedars Sinai Medical Center +PIName: Jesse Meyer From 52ce02a4363a85bdf4feead40e55cbdeb46f1421 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:25:15 -0500 Subject: [PATCH 015/184] Create USDA_Andorf.yaml --- projects/USDA_Andorf.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/USDA_Andorf.yaml diff --git a/projects/USDA_Andorf.yaml b/projects/USDA_Andorf.yaml new file mode 100644 index 000000000..27576959c --- /dev/null +++ b/projects/USDA_Andorf.yaml @@ -0,0 +1,8 @@ +Description: > + The research is part of the Maize Genetics and Genomics Database (MaizeGD) to utilize protein structure models to improve maize functional genomics. + The project will generate new protein structure models to improve functional classification, canonical isoform detection, + gene structure annotation, and assigning confidence scores to point mutations based on the likelihood to change function. +Department: Midwest Area, Corn Insects, and Crop Genetics Research Unit +FieldOfScience: Biological and Biomedical Sciences +Organization: United States Department of Agriculture +PIName: Carson Andorf From 314f95a9c7315bfe63a0b9551ddcd546eb1129a4 Mon Sep 17 00:00:00 2001 From: Sravya Uppalapati Date: Tue, 11 Jul 2023 13:02:31 -0700 Subject: [PATCH 016/184] [CIT_CMS_T2] Scheduled downtime for storage node maintenance --- .../CIT_CMS_T2_downtime.yaml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml index 3ce08a270..5eecfcf65 100644 --- a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml +++ b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml @@ -1772,3 +1772,82 @@ Services: - XRootD component +# ---------------------------------------------------------- +# CEPH (storage) node maintenance + +- Class: SCHEDULED + ID: 1540089672 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2 + Services: + - CE + +- Class: SCHEDULED + ID: 1540089673 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2B + Services: + - CE + +- Class: SCHEDULED + ID: 1540089674 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2C + Services: + - CE + +- Class: SCHEDULED + ID: 1540089675 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2_Squid + Services: + - Squid + +- Class: SCHEDULED + ID: 1540089676 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2_2_Squid + Services: + - Squid + +- Class: SCHEDULED + ID: 1540089677 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT-CMS-T2-XRD + Services: + - XRootD component + +- Class: SCHEDULED + ID: 1540089678 + Description: CEPH (storage) node maintenance + Severity: Outage + StartTime: Jul 13, 2023 13:00 -0700 + EndTime: Jul 14, 2023 13:00 -0700 + CreatedTime: Jul 11, 2023 13:00 -0700 + ResourceName: CIT_CMS_T2_XRD_Ceph + Services: + - XRootD component From 98369d15d0fb8831c7f7647443da6962974353e5 Mon Sep 17 00:00:00 2001 From: Sravya Uppalapati Date: Tue, 11 Jul 2023 14:20:50 -0700 Subject: [PATCH 017/184] CANCEL - [CIT_CMS_T2] Scheduled downtime --- .../CIT_CMS_T2_downtime.yaml | 79 ------------------- 1 file changed, 79 deletions(-) diff --git a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml index 5eecfcf65..3ce08a270 100644 --- a/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml +++ b/topology/California Institute of Technology/Caltech CMS Tier2/CIT_CMS_T2_downtime.yaml @@ -1772,82 +1772,3 @@ Services: - XRootD component -# ---------------------------------------------------------- -# CEPH (storage) node maintenance - -- Class: SCHEDULED - ID: 1540089672 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2 - Services: - - CE - -- Class: SCHEDULED - ID: 1540089673 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2B - Services: - - CE - -- Class: SCHEDULED - ID: 1540089674 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2C - Services: - - CE - -- Class: SCHEDULED - ID: 1540089675 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2_Squid - Services: - - Squid - -- Class: SCHEDULED - ID: 1540089676 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2_2_Squid - Services: - - Squid - -- Class: SCHEDULED - ID: 1540089677 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT-CMS-T2-XRD - Services: - - XRootD component - -- Class: SCHEDULED - ID: 1540089678 - Description: CEPH (storage) node maintenance - Severity: Outage - StartTime: Jul 13, 2023 13:00 -0700 - EndTime: Jul 14, 2023 13:00 -0700 - CreatedTime: Jul 11, 2023 13:00 -0700 - ResourceName: CIT_CMS_T2_XRD_Ceph - Services: - - XRootD component From a275b2df0743fc548591232c95125241bcf42d6f Mon Sep 17 00:00:00 2001 From: Irakli Chakaberia Date: Wed, 12 Jul 2023 13:41:10 -0500 Subject: [PATCH 018/184] reporting downtime at LBL_HPCS [including Lawrencium] --- .../LBL_HPCS/LBL_HPCS_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Lawrence Berkley National Laboratory/LBL_HPCS/LBL_HPCS_downtime.yaml b/topology/Lawrence Berkley National Laboratory/LBL_HPCS/LBL_HPCS_downtime.yaml index 7d564c542..3a70ccef6 100644 --- a/topology/Lawrence Berkley National Laboratory/LBL_HPCS/LBL_HPCS_downtime.yaml +++ b/topology/Lawrence Berkley National Laboratory/LBL_HPCS/LBL_HPCS_downtime.yaml @@ -20,3 +20,14 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1541895313 + Description: Power outage/work affecting our site + Severity: Outage + StartTime: Jul 20, 2023 17:00 +0000 + EndTime: Jul 25, 2023 01:00 +0000 + CreatedTime: Jul 12, 2023 19:18 +0000 + ResourceName: LBL_HPCS_LRC + Services: + - CE +# --------------------------------------------------------- From 06a5099d94393c2f3f13dc3c8dc3f785807e0cf1 Mon Sep 17 00:00:00 2001 From: Stefan Piperov Date: Wed, 12 Jul 2023 19:21:56 -0400 Subject: [PATCH 019/184] Add downtime for Purdue - cluster and storage maintenance --- .../Purdue CMS/Purdue_downtime.yaml | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml b/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml index 1ea8065d1..bd866483c 100644 --- a/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml +++ b/topology/Purdue University/Purdue CMS/Purdue_downtime.yaml @@ -1702,3 +1702,135 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037973 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Bell + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037974 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Brown + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037975 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Hadoop-CE + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037976 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Hadoop-SE-Gridftp + Services: + - GridFtp +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037977 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Halstead + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037978 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Hammer + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037979 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Negishi + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037980 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: Purdue-Rice + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037981 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: T2_US_Purdue_Squid1 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037982 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: T2_US_Purdue_Squid2 + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037983 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: US-Purdue BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542037984 + Description: Cluster and storage maintenance + Severity: Outage + StartTime: Jul 19, 2023 11:00 +0000 + EndTime: Jul 19, 2023 23:00 +0000 + CreatedTime: Jul 12, 2023 23:16 +0000 + ResourceName: US-Purdue LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- From 95468bc0d0b289a58fb1c9b8167b01952827d997 Mon Sep 17 00:00:00 2001 From: rvaladao <45594439+rvaladao@users.noreply.github.com> Date: Thu, 13 Jul 2023 09:39:12 -0300 Subject: [PATCH 020/184] Update UERJ_downtime.yaml Requesting a downtime from Jul 17 to Jul 21 --- .../T2_BR_UERJ/UERJ_downtime.yaml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml index aa33264e9..63bc91021 100644 --- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml +++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml @@ -696,4 +696,65 @@ Services: - net.perfSONAR.Bandwidth # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542518458 + Description: We will install/replace physical servers, reposition racks, and servers + and swap cables. Everything will be impacted. + Severity: Outage + StartTime: Jul 17, 2023 10:00 +0000 + EndTime: Jul 21, 2023 21:00 +0000 + CreatedTime: Jul 13, 2023 12:37 +0000 + ResourceName: UERJ_CE + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542518883 + Description: We will install/replace physical servers, reposition racks, and servers + and swap cables. Everything will be impacted. + Severity: Outage + StartTime: Jul 17, 2023 10:00 +0000 + EndTime: Jul 21, 2023 21:00 +0000 + CreatedTime: Jul 13, 2023 12:38 +0000 + ResourceName: UERJ_CE_2 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542518984 + Description: We will install/replace physical servers, reposition racks, and servers + and swap cables. Everything will be impacted. + Severity: Outage + StartTime: Jul 17, 2023 10:00 +0000 + EndTime: Jul 21, 2023 21:00 +0000 + CreatedTime: Jul 13, 2023 12:38 +0000 + ResourceName: UERJ_SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542519096 + Description: We will install/replace physical servers, reposition racks, and servers + and swap cables. Everything will be impacted. + Severity: Outage + StartTime: Jul 17, 2023 10:00 +0000 + EndTime: Jul 21, 2023 21:00 +0000 + CreatedTime: Jul 13, 2023 12:38 +0000 + ResourceName: UERJ_SQUID + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1542519189 + Description: We will install/replace physical servers, reposition racks, and servers + and swap cables. Everything will be impacted. + Severity: Outage + StartTime: Jul 17, 2023 10:00 +0000 + EndTime: Jul 21, 2023 21:00 +0000 + CreatedTime: Jul 13, 2023 12:38 +0000 + ResourceName: UERJ_SQUID_2 + Services: + - Squid +# --------------------------------------------------------- + From ca1d76004e45d6be2a05c1c779dc8ea7a4c06eb8 Mon Sep 17 00:00:00 2001 From: Jeff Dost Date: Thu, 13 Jul 2023 09:18:40 -0500 Subject: [PATCH 021/184] add CC* tag to PSU --- topology/Penn State University/PSU LIGO/PSU-LIGO.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml index 3ec7c5aa3..910eb35b7 100644 --- a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml +++ b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml @@ -11,17 +11,11 @@ Resources: ContactLists: Administrative Contact: Primary: - Name: Jeffrey Peterson - ID: 3ef2e11c271234a34f154e75b28d3b4554bb8f63 - Secondary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba Security Contact: Primary: - Name: Jeffrey Peterson - ID: 3ef2e11c271234a34f154e75b28d3b4554bb8f63 - Secondary: Name: Jeffrey Michael Dost ID: 3a8eb6436a8b78ca50f7e93bb2a4d1f0141212ba @@ -30,6 +24,8 @@ Resources: Services: CE: Description: Hosted CE for PSU-LIGO + Tags: + - CC* PSU-LIGO-CACHE: Active: false From d387bd296f4f48a26531d792063d01dbe5b13343 Mon Sep 17 00:00:00 2001 From: Jeff Dost Date: Thu, 13 Jul 2023 09:34:19 -0500 Subject: [PATCH 022/184] clarify CC* usage --- topology/Penn State University/PSU LIGO/PSU-LIGO.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml index 910eb35b7..02afde6ce 100644 --- a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml +++ b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml @@ -1,12 +1,12 @@ Production: true SupportCenter: Self Supported -GroupDescription: This is a cluster for LIGO use at Penn State University +GroupDescription: This is a cluster for LIGO and OSG use at Penn State University GroupID: 1120 Resources: PSU-LIGO: Active: true - Description: This is a Hosted CE for LIGO use at Penn State. + Description: This is a Hosted CE for LIGO use at Penn State. It also has a subset of CC* nodes for OSG to use ID: 1172 ContactLists: Administrative Contact: From 9ae284e4f97ada733ba70aad9d0e14f8f65559c3 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 13 Jul 2023 09:35:57 -0500 Subject: [PATCH 023/184] Update PSU Hosted CE service description --- topology/Penn State University/PSU LIGO/PSU-LIGO.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml index 02afde6ce..ae9361d4a 100644 --- a/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml +++ b/topology/Penn State University/PSU LIGO/PSU-LIGO.yaml @@ -23,7 +23,7 @@ Resources: Services: CE: - Description: Hosted CE for PSU-LIGO + Description: Hosted CE for PSU-LIGO and OSPool at PSU Tags: - CC* From 467513ad31fb732fea0fc6e3efe3823fa250aebd Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 13 Jul 2023 10:39:46 -0500 Subject: [PATCH 024/184] Changes fqdn for fsu hnpgrid --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index c3eba826b..1d1916b1a 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -18,7 +18,7 @@ Resources: ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd Name: Sean Dobbs Description: Hosted CE for HNPGRID cluster - FQDN: hosted-ce07.grid.uchicago.edu + FQDN: fsu-hnpgrid-ce1.svc.opensciencegrid.org ID: 899 Services: CE: From 8a600a683e582931357a4b6d2954d043d640a046 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 13 Jul 2023 11:09:00 -0500 Subject: [PATCH 025/184] Fixes the right fqdn to change --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index 1d1916b1a..b00474f1d 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -18,7 +18,7 @@ Resources: ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd Name: Sean Dobbs Description: Hosted CE for HNPGRID cluster - FQDN: fsu-hnpgrid-ce1.svc.opensciencegrid.org + FQDN: hosted-ce07.grid.uchicago.edu ID: 899 Services: CE: @@ -43,7 +43,7 @@ Resources: ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd Name: Sean Dobbs Description: Hosted CE for HNPGRID cluster - FQDN: hosted-ce07.opensciencegrid.org + FQDN: fsu-hnpgrid-ce1.svc.opensciencegrid.org ID: 1080 Services: CE: From 601547d1f372980ec325bef6be99fd25da8758b7 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 13 Jul 2023 11:19:19 -0500 Subject: [PATCH 026/184] Sets uchicago entry to inactive --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index b00474f1d..d83d34ecb 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -3,7 +3,7 @@ GroupID: 475 Production: true Resources: GLUEX_US_FSU_HNPGRID: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From 3a6157f4b4ec693a8a0d5d28c7dbaa5c42e4b54c Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Thu, 13 Jul 2023 13:40:16 -0500 Subject: [PATCH 027/184] University of Maine + System --- .../FACILITY.yaml | 0 .../Maine-ACG/Maine-ACG.yaml | 0 .../Maine-ACG/SITE.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename topology/{University of Maine => University of Maine System}/FACILITY.yaml (100%) rename topology/{University of Maine => University of Maine System}/Maine-ACG/Maine-ACG.yaml (100%) rename topology/{University of Maine => University of Maine System}/Maine-ACG/SITE.yaml (100%) diff --git a/topology/University of Maine/FACILITY.yaml b/topology/University of Maine System/FACILITY.yaml similarity index 100% rename from topology/University of Maine/FACILITY.yaml rename to topology/University of Maine System/FACILITY.yaml diff --git a/topology/University of Maine/Maine-ACG/Maine-ACG.yaml b/topology/University of Maine System/Maine-ACG/Maine-ACG.yaml similarity index 100% rename from topology/University of Maine/Maine-ACG/Maine-ACG.yaml rename to topology/University of Maine System/Maine-ACG/Maine-ACG.yaml diff --git a/topology/University of Maine/Maine-ACG/SITE.yaml b/topology/University of Maine System/Maine-ACG/SITE.yaml similarity index 100% rename from topology/University of Maine/Maine-ACG/SITE.yaml rename to topology/University of Maine System/Maine-ACG/SITE.yaml From 01aa872a241c00b0f9add1410cad2e85ebf4d118 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 13 Jul 2023 10:27:56 -0500 Subject: [PATCH 028/184] Remove the ability for PF users to read from the OSPool namespace Related to https://opensciencegrid.atlassian.net/browse/INF-641 --- virtual-organizations/PATh.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virtual-organizations/PATh.yaml b/virtual-organizations/PATh.yaml index 65e364248..25bc35c50 100644 --- a/virtual-organizations/PATh.yaml +++ b/virtual-organizations/PATh.yaml @@ -67,7 +67,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://path-cc.io - Base Path: /ospool/PROTECTED,/path-facility/data,/path-facility/projects + Base Path: /path-facility/data,/path-facility/projects Map Subject: True AllowedOrigins: - CHTC-PATH-ORIGIN @@ -87,7 +87,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://path-cc.io - Base Path: /ospool/PROTECTED,/path-facility/data,/path-facility/projects + Base Path: /path-facility/data,/path-facility/projects Map Subject: True AllowedOrigins: - CHTC-PATH-ORIGIN From f288d3da8292edf972b29d92637147c45dfe729f Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 13 Jul 2023 15:50:43 -0500 Subject: [PATCH 029/184] Updates FQDN to migrated name --- .../ComputeCanada - Cedar/ComputeCanada-Cedar.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Compute Canada/ComputeCanada - Cedar/ComputeCanada-Cedar.yaml b/topology/Compute Canada/ComputeCanada - Cedar/ComputeCanada-Cedar.yaml index 11fe41f73..6b975e402 100644 --- a/topology/Compute Canada/ComputeCanada - Cedar/ComputeCanada-Cedar.yaml +++ b/topology/Compute Canada/ComputeCanada - Cedar/ComputeCanada-Cedar.yaml @@ -26,7 +26,7 @@ Resources: Primary: Name: Richard T Jones ID: 650bf84a5cf49caf504fed22ce07b98580c6fa12 - FQDN: hosted-ce28.opensciencegrid.org + FQDN: computecanada-cedar-ce1.svc.opensciencegrid.org Services: CE: Description: ComputeCanada-Cedar Hosted CE From 7a2f35f499ed87010924e4d5b048d55c6df83566 Mon Sep 17 00:00:00 2001 From: Lincoln Bryant Date: Thu, 13 Jul 2023 17:08:50 -0500 Subject: [PATCH 030/184] Update UChicagoCachingInfrastructure.yaml Remove stashcache and test stashcache --- .../UChicagoCachingInfrastructure.yaml | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/topology/University of Chicago/UChicago/UChicagoCachingInfrastructure.yaml b/topology/University of Chicago/UChicago/UChicagoCachingInfrastructure.yaml index a38e244c9..d305f7f0e 100644 --- a/topology/University of Chicago/UChicago/UChicagoCachingInfrastructure.yaml +++ b/topology/University of Chicago/UChicago/UChicagoCachingInfrastructure.yaml @@ -21,56 +21,3 @@ Resources: Description: OSG Connect Origin Server AllowedVOs: - OSG - UCHICAGO_STASHCACHE_CACHE: - Active: false - Description: UChicago StashCache XRootD cache server - ID: 989 - ContactLists: - Administrative Contact: - Primary: - ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97 - Name: Lincoln Bryant - Secondary: - ID: a418fbc5dd33637bba264c01d84d52dd317f2813 - Name: Judith Stephen - Tertiary: - ID: 876425696868c8a32fa1b8ee1db792b5c76a9f37 - Name: Terrence Martin - Security Contact: - Secondary: - ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97 - Name: Lincoln Bryant - FQDN: stashcache.grid.uchicago.edu - DN: /DC=org/DC=incommon/C=US/ST=IL/L=Chicago/O=University of Chicago/OU=IT Services - Self Enrollment/CN=stashcache.grid.uchicago.edu - Services: - XRootD cache server: - Description: StashCache cache server - AllowedVOs: - - ANY - UCHICAGO_TEST_STASHCACHE_CACHE: - FQDN: stashcache.uchicago.slateci.net - DN: /DC=org/DC=incommon/C=US/ST=IL/L=Chicago/O=University of Chicago/OU=IT Services - Self Enrollment/CN=stashcache.uchicago.slateci.net - Services: - Active: true - ID: 999 - ContactLists: - Administrative Contact: - Primary: - ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97 - Name: Lincoln Bryant - Secondary: - ID: 2d78d115b8b035ba841646faceb9ad0c3413f605 - Name: Christopher Weaver - Tertiary: - ID: 7f81bd8445354d9d8929ebdddb39fae976e2b338 - Name: Pascal Paschos - Security Contact: - Secondary: - ID: 0a22bab3de2d83d723811e3fb1ebca904e924a97 - Name: Lincoln Bryant - Services: - XRootD cache server: - Description: StashCache cache server - AllowedVOs: - - ANY_PUBLIC - - LIGO From 093b2ee47fadf2088511cae130267ad50b025235 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 14 Jul 2023 15:59:14 -0500 Subject: [PATCH 031/184] Add OHSU -> Oregon Health & Science University mapping (#3247) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index f9746dd8f..32cad4edb 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -49,6 +49,7 @@ NMSU: "New Mexico State University" NOAA: "National Oceanic and Atmospheric Administration" Northeastern: "Northeastern University" NSHE: "Nevada System of Higher Education" +OHSU: "Oregon Health & Science University" OSU: "The Ohio State University" Pitt: "University of Pittsburgh" PortlandState: "Portland State University" From db84089e74e77a1fcf3ec0838502b1218f165511 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 14 Jul 2023 16:00:08 -0500 Subject: [PATCH 032/184] Add PSI -> Planetary Science Institute mapping (#3256) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index 32cad4edb..f388dc55d 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -53,6 +53,7 @@ OHSU: "Oregon Health & Science University" OSU: "The Ohio State University" Pitt: "University of Pittsburgh" PortlandState: "Portland State University" +PSI: "Planetary Science Institute" PSU: "Pennsylvania State University" Repertoire: "Repertoire Immune Medicines" Rochester: "University of Rochester" From eb2ea30cc78adfd71b77b26c8ce03a7a8beb2454 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 14 Jul 2023 16:01:13 -0500 Subject: [PATCH 033/184] Add USDA -> United States Department of Agriculture mapping (#3261) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index f388dc55d..124f43b14 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -86,6 +86,7 @@ UMCES: "University of Maryland Center for Environmental Science" UMiss: "University of Mississippi" UNL: "University of Nebraska - Lincoln" USD: "University of South Dakota" +USDA: "United States Department of Agriculture" USheffield: "University of Sheffield" UTEP: "University of Texas at El Paso" UTulsa: "University of Tulsa" From 6dda4a842c25b3716fd2542ae61146b011dada8d Mon Sep 17 00:00:00 2001 From: Horst Severini <32679601+hseverini@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:50:56 -0500 Subject: [PATCH 034/184] SLURM upgrade --- .../OU ATLAS/OU_OSCER_ATLAS_downtime.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml b/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml index edc5ddc45..fa5116dcf 100644 --- a/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml +++ b/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml @@ -685,3 +685,15 @@ - GridFtp - XRootD component # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1546161183 + Description: SLURM upgrade + Severity: Outage + StartTime: Jul 19, 2023 13:00 +0000 + EndTime: Jul 20, 2023 04:00 +0000 + CreatedTime: Jul 17, 2023 17:48 +0000 + ResourceName: OU_OSCER_ATLAS + Services: + - CE + - GridFtp +# --------------------------------------------------------- From ba93f07edec28d1c600ab119fbb871c25029813f Mon Sep 17 00:00:00 2001 From: Christina K Date: Mon, 17 Jul 2023 13:55:42 -0500 Subject: [PATCH 035/184] Add Project UCI_Sheng --- projects/UCI_Sheng.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 projects/UCI_Sheng.yaml diff --git a/projects/UCI_Sheng.yaml b/projects/UCI_Sheng.yaml new file mode 100644 index 000000000..6413714b6 --- /dev/null +++ b/projects/UCI_Sheng.yaml @@ -0,0 +1,6 @@ +Department: Paul Merage School of Business +Description: 'Research on the US housing market and transactions with the aim of comprehending + how housing prices move and are correlated with each other. ' +FieldOfScience: Economics +Organization: University of California Irvine +PIName: Jinfei Sheng From d953c76326747c7bcc49fd6eb64726430a5a94ef Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 17 Jul 2023 16:41:40 -0500 Subject: [PATCH 036/184] Align org name --- projects/UCI_Sheng.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/UCI_Sheng.yaml b/projects/UCI_Sheng.yaml index 6413714b6..d9ead59ff 100644 --- a/projects/UCI_Sheng.yaml +++ b/projects/UCI_Sheng.yaml @@ -2,5 +2,5 @@ Department: Paul Merage School of Business Description: 'Research on the US housing market and transactions with the aim of comprehending how housing prices move and are correlated with each other. ' FieldOfScience: Economics -Organization: University of California Irvine +Organization: University of California, Irvine PIName: Jinfei Sheng From 4e52a1453a08c4b2c17f8f80a5bd0f58feb47f8a Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 18 Jul 2023 10:50:34 -0500 Subject: [PATCH 037/184] Put MSKCC_Chodera.yaml in the correct location --- {data => projects}/MSKCC_Chodera.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {data => projects}/MSKCC_Chodera.yaml (100%) diff --git a/data/MSKCC_Chodera.yaml b/projects/MSKCC_Chodera.yaml similarity index 100% rename from data/MSKCC_Chodera.yaml rename to projects/MSKCC_Chodera.yaml From d2d8a45724a569f31300452c3accf6980295ebf7 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 18 Jul 2023 12:56:44 -0500 Subject: [PATCH 038/184] Add mapping for MSKCC -> Memorial Sloan Kettering Cancer Center (#3215) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index 124f43b14..29b082ad6 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -39,6 +39,7 @@ Mines: "Colorado School of Mines" MIT: "Massachusetts Institute of Technology" Mizzou: "University of Missouri" MMC: "Meharry Medical College" +MSKCC: "Memorial Sloan Kettering Cancer Center" MSU: "Montana State University" MTU: "Michigan Technological University" NCSU: "North Carolina State University" From f5889421bc36772caaebbb04987bc6ec5d59cad5 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 18 Jul 2023 14:54:29 -0500 Subject: [PATCH 039/184] Add WISC-PATH-IDPL-EP, an EP running in the Wisconsin PATh Facility for Greg's IDPL testing --- .../WISC-PATH/WISC-PATH.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/topology/University of Wisconsin/WISC-PATH/WISC-PATH.yaml b/topology/University of Wisconsin/WISC-PATH/WISC-PATH.yaml index b453ab250..9f37f3f4c 100644 --- a/topology/University of Wisconsin/WISC-PATH/WISC-PATH.yaml +++ b/topology/University of Wisconsin/WISC-PATH/WISC-PATH.yaml @@ -27,3 +27,27 @@ Resources: Services: Execution Endpoint: Description: Backfill containers running in the PATh facility + + WISC-PATH-IDPL-EP: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000192 + Name: Gregory Thain + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: EP running in the Wisconsin PATh Facility for IDPL testing + FQDN: wisc-path-idpl-ep.facility.path-cc.io + ID: 1463 + Services: + Execution Endpoint: + Description: EP running in the Wisconsin PATh Facility for IDPL testing From 79109b74ff32aee9708bc3454b84a4654d60693e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 18 Jul 2023 14:57:55 -0500 Subject: [PATCH 040/184] Add FIU-PATH-IDPL-EP, an EP running in the FIU PATh Facility for Greg's IDPL testing --- .../FIU-PATH/FIU-PATH.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/topology/University of Wisconsin/FIU-PATH/FIU-PATH.yaml b/topology/University of Wisconsin/FIU-PATH/FIU-PATH.yaml index e391980fe..93e96858c 100644 --- a/topology/University of Wisconsin/FIU-PATH/FIU-PATH.yaml +++ b/topology/University of Wisconsin/FIU-PATH/FIU-PATH.yaml @@ -28,6 +28,30 @@ Resources: Execution Endpoint: Description: Backfill containers running in the osg production namespace. + FIU-PATH-IDPL-EP: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000192 + Name: Gregory Thain + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: EP running in the FIU PATh Facility for IDPL testing + FQDN: fiu-path-idpl-ep.facility.path-cc.io + ID: 1464 + Services: + Execution Endpoint: + Description: EP running in the FIU PATh Facility for IDPL testing + FIU_OSDF_CACHE: Active: false Description: FIU IPv6 OSDF cache From e6e4e956a0f836d9ee63e7905e5f405fd09f062c Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 18 Jul 2023 15:22:20 -0500 Subject: [PATCH 041/184] Create Utah_Nelson.yaml --- projects/Utah_Nelson.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 projects/Utah_Nelson.yaml diff --git a/projects/Utah_Nelson.yaml b/projects/Utah_Nelson.yaml new file mode 100644 index 000000000..ba5ec48e5 --- /dev/null +++ b/projects/Utah_Nelson.yaml @@ -0,0 +1,7 @@ +Description: > + Monte Carlo research for the simulation of radiation transport for applications in medicine. + Will be looking at proton therapy applications specifically using the Geant4 wrapper, TOPAS. +Department: Department of Radiation Oncology +FieldOfScience: Physics and radiation therapy +Organization: University of Utah +PIName: Nicholas Nelson From c24b8bb82451611a8e62e0d9979bd34c612412d1 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 18 Jul 2023 16:08:34 -0500 Subject: [PATCH 042/184] Fix organization name --- projects/CedarsSinai_Meyer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/CedarsSinai_Meyer.yaml b/projects/CedarsSinai_Meyer.yaml index e53c4b900..ef3b3ae14 100644 --- a/projects/CedarsSinai_Meyer.yaml +++ b/projects/CedarsSinai_Meyer.yaml @@ -6,5 +6,5 @@ Description: > is a way we can use OSG by sending jobs that are prepared on our website hosted on AWS to the OSG for execution. Department: Computational Biomedicine FieldOfScience: Biological and Biomedical Sciences -Organization: Cedars Sinai Medical Center +Organization: Cedars-Sinai Medical Center PIName: Jesse Meyer From 13ec3672161fb77a361edc534496dad897b8f73f Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 18 Jul 2023 17:01:32 -0500 Subject: [PATCH 043/184] Create CedarsSinai -> Cedars-Sinai Medical Center mapping (#3257) --- mappings/project_institution.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mappings/project_institution.yaml b/mappings/project_institution.yaml index 29b082ad6..5950a48f4 100644 --- a/mappings/project_institution.yaml +++ b/mappings/project_institution.yaml @@ -10,6 +10,7 @@ BNL: "Brookhaven National Laboratory" BU: "Boston University" BYUI: "Brigham Young University Idaho" Caltech: "California Institute of Technology" +CedarsSinai: "Cedars-Sinai Medical Center" Cincinnati: "University of Cincinnati" Clarkson: "Clarkson University" Coe: "Coe College" From 2ec6d935892822a3facf8dffb3d44818628cc615 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 19 Jul 2023 11:14:06 -0700 Subject: [PATCH 044/184] Activating I2Houston2 --- .../Internet2/Internet2Houston/I2HoustonInfrastructure.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml index 8e6a52fa5..9284c00ac 100644 --- a/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml +++ b/topology/Internet2/Internet2Houston/I2HoustonInfrastructure.yaml @@ -26,7 +26,7 @@ Resources: - ANY HOUSTON2_INTERNET2_OSDF_CACHE: - Active: false + Active: true Description: Internet2 Houston Cache ID: 1419 ContactLists: From e8298887e054477906451d724e325ece8276b409 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Wed, 19 Jul 2023 11:16:09 -0700 Subject: [PATCH 045/184] Adding new cache to VO adding HOUSTON2_INTERNET2_OSDF_CACHE --- virtual-organizations/LIGO.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virtual-organizations/LIGO.yaml b/virtual-organizations/LIGO.yaml index cb575586f..294ae43bd 100644 --- a/virtual-organizations/LIGO.yaml +++ b/virtual-organizations/LIGO.yaml @@ -118,6 +118,7 @@ DataFederations: - DENVER_INTERNET2_OSDF_CACHE - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE + - HOUSTON2_INTERNET2_OSDF_CACHE - Path: /igwn/virgo Authorizations: - FQAN: /osg/ligo @@ -161,6 +162,7 @@ DataFederations: - DENVER_INTERNET2_OSDF_CACHE - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE + - HOUSTON2_INTERNET2_OSDF_CACHE - Path: /igwn/ligo Authorizations: - FQAN: /osg/ligo @@ -203,7 +205,8 @@ DataFederations: - JACKSONVILLE_INTERNET2_OSDF_CACHE - DENVER_INTERNET2_OSDF_CACHE - AMSTERDAM_ESNET_OSDF_CACHE - - LONDON_ESNET_OSDF_CACHE + - LONDON_ESNET_OSDF_CACHE + - HOUSTON2_INTERNET2_OSDF_CACHE - Path: /igwn/shared Authorizations: - FQAN: /osg/ligo @@ -247,6 +250,7 @@ DataFederations: - DENVER_INTERNET2_OSDF_CACHE - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE + - HOUSTON2_INTERNET2_OSDF_CACHE - Path: /gwdata Authorizations: - PUBLIC From b3d06cb818e491f624ac378e799322b17272d238 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 19 Jul 2023 13:26:32 -0500 Subject: [PATCH 046/184] Add WISC-PATH-DEV ResourceGroup with an EP, WISC-PATH-DEV-EP. This resource group is marked as ITB; the EP points to the test PF central manager instead of production --- .../WISC-PATH/WISC-PATH-DEV.yaml | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 topology/University of Wisconsin/WISC-PATH/WISC-PATH-DEV.yaml diff --git a/topology/University of Wisconsin/WISC-PATH/WISC-PATH-DEV.yaml b/topology/University of Wisconsin/WISC-PATH/WISC-PATH-DEV.yaml new file mode 100644 index 000000000..b219ac8f3 --- /dev/null +++ b/topology/University of Wisconsin/WISC-PATH/WISC-PATH-DEV.yaml @@ -0,0 +1,29 @@ +Production: false +SupportCenter: Self Supported +GroupDescription: Development PATh facility resources located at UW-Madison +GroupID: 1362 + +Resources: + WISC-PATH-DEV-EP: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + Security Contact: + Primary: + ID: OSG1000015 + Name: Aaron Moate + Description: PATh Facility EP located at UW-Madison in the development PATh pool + FQDN: wisc-path-dev-ep.facility.path-cc.io + ID: 1465 + Services: + Execution Endpoint: + Description: PATh Facility EP located at UW-Madison in the development PATh pool From b9b44df6ab646c3a838dc31f849386704a9824a1 Mon Sep 17 00:00:00 2001 From: Josh Willis Date: Wed, 19 Jul 2023 15:22:32 -0500 Subject: [PATCH 047/184] Add CIT LIGO cache to LIGO.yaml Add new CIT_LIGO_STASHCACHE OSDF cache to AllowedCaches for each authenticated IGWN Namespace. --- virtual-organizations/LIGO.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virtual-organizations/LIGO.yaml b/virtual-organizations/LIGO.yaml index 294ae43bd..f6ef8efcd 100644 --- a/virtual-organizations/LIGO.yaml +++ b/virtual-organizations/LIGO.yaml @@ -119,6 +119,7 @@ DataFederations: - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE + - CIT_LIGO_STASHCACHE - Path: /igwn/virgo Authorizations: - FQAN: /osg/ligo @@ -163,6 +164,7 @@ DataFederations: - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE + - CIT_LIGO_STASHCACHE - Path: /igwn/ligo Authorizations: - FQAN: /osg/ligo @@ -207,6 +209,7 @@ DataFederations: - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE + - CIT_LIGO_STASHCACHE - Path: /igwn/shared Authorizations: - FQAN: /osg/ligo @@ -251,6 +254,7 @@ DataFederations: - AMSTERDAM_ESNET_OSDF_CACHE - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE + - CIT_LIGO_STASHCACHE - Path: /gwdata Authorizations: - PUBLIC From 5544343a827dbd86b83273ddba78d1c309c1ff4e Mon Sep 17 00:00:00 2001 From: Horst Severini <32679601+hseverini@users.noreply.github.com> Date: Wed, 19 Jul 2023 21:21:32 -0500 Subject: [PATCH 048/184] Maintenance finished --- .../OU ATLAS/OU_OSCER_ATLAS_downtime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml b/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml index fa5116dcf..023661a50 100644 --- a/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml +++ b/topology/University of Oklahoma/OU ATLAS/OU_OSCER_ATLAS_downtime.yaml @@ -690,7 +690,7 @@ Description: SLURM upgrade Severity: Outage StartTime: Jul 19, 2023 13:00 +0000 - EndTime: Jul 20, 2023 04:00 +0000 + EndTime: Jul 20, 2023 02:30 +0000 CreatedTime: Jul 17, 2023 17:48 +0000 ResourceName: OU_OSCER_ATLAS Services: From 524b4c79a43a34107b79b7ecb381786e198498de Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Fri, 21 Jul 2023 11:56:36 -0500 Subject: [PATCH 049/184] Add dev PATh Facility origin --- .../CHTC/PATh_facility_ITB.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 topology/University of Wisconsin/CHTC/PATh_facility_ITB.yaml diff --git a/topology/University of Wisconsin/CHTC/PATh_facility_ITB.yaml b/topology/University of Wisconsin/CHTC/PATh_facility_ITB.yaml new file mode 100644 index 000000000..0c9868ffd --- /dev/null +++ b/topology/University of Wisconsin/CHTC/PATh_facility_ITB.yaml @@ -0,0 +1,38 @@ +--- +Production: false +SupportCenter: Self Supported +GroupDescription: PATh facility development resources located at CHTC. +GroupID: 1363 + +Resources: + CHTC-ITB-PATH-ORIGIN: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000003 + Name: Brian Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + Security Contact: + Primary: + ID: OSG1000003 + Name: Brian Lin + Secondary: + ID: OSG1000002 + Name: Matyas Selmeci + Tertiary: + ID: OSG1000001 + Name: Brian Bockelman + FQDN: path-origin.osgdev.chtc.io + DN: /CN=path-origin.osgdev.chtc.io + ID: 1466 + Services: + XRootD origin server: + Description: OSDF origin server + AllowedVOs: + - PATh From d2ba4917beafb481e93aa2f0fa6a6a86d02a83e9 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Fri, 21 Jul 2023 12:00:57 -0500 Subject: [PATCH 050/184] Add PF ITB origin namespace data --- virtual-organizations/PATh.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/virtual-organizations/PATh.yaml b/virtual-organizations/PATh.yaml index 25bc35c50..a9f39bd7b 100644 --- a/virtual-organizations/PATh.yaml +++ b/virtual-organizations/PATh.yaml @@ -67,7 +67,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://path-cc.io - Base Path: /path-facility/data,/path-facility/projects + Base Path: /path-facility/data,/path-facility/development/,/path-facility/projects Map Subject: True AllowedOrigins: - CHTC-PATH-ORIGIN @@ -87,7 +87,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://path-cc.io - Base Path: /path-facility/data,/path-facility/projects + Base Path: /path-facility/data,/path-facility/development/,/path-facility/projects Map Subject: True AllowedOrigins: - CHTC-PATH-ORIGIN @@ -102,3 +102,16 @@ DataFederations: - CHTC_TIGER_CACHE Writeback: https://ap1-origin.facility.path-cc.io:1095 DirList: https://ap1-origin.facility.path-cc.io:1095 + + - Path: /path-facility/development + Authorizations: + - SciTokens: + Issuer: https://path-cc.io + Base Path: /path-facility/data,/path-facility/development/,/path-facility/projects + Map Subject: True + AllowedOrigins: + - CHTC-ITB-PATH-ORIGIN + AllowedCaches: + - ANY + Writeback: https://path-origin.osgdev.chtc.io:1095 + DirList: https://path-origin.osgdev.chtc.io:1095 From c8a26174fe9d4c19068f87344f8ec3677480032d Mon Sep 17 00:00:00 2001 From: rvaladao <45594439+rvaladao@users.noreply.github.com> Date: Fri, 21 Jul 2023 17:00:12 -0300 Subject: [PATCH 051/184] Update UERJ_downtime.yaml --- .../T2_BR_UERJ/UERJ_downtime.yaml | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml index 63bc91021..8d238a8ec 100644 --- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml +++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ_downtime.yaml @@ -756,5 +756,60 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1549695465 + Description: We need to perform further network tests before activating back the site + Severity: Outage + StartTime: Jul 21, 2023 20:00 +0000 + EndTime: Jul 25, 2023 21:00 +0000 + CreatedTime: Jul 21, 2023 19:59 +0000 + ResourceName: UERJ_CE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1549695615 + Description: We need to perform further network tests before activating back the site + Severity: Outage + StartTime: Jul 21, 2023 20:00 +0000 + EndTime: Jul 25, 2023 21:00 +0000 + CreatedTime: Jul 21, 2023 19:59 +0000 + ResourceName: UERJ_CE_2 + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1549695696 + Description: We need to perform further network tests before activating back the site + Severity: Outage + StartTime: Jul 21, 2023 20:00 +0000 + EndTime: Jul 25, 2023 21:00 +0000 + CreatedTime: Jul 21, 2023 19:59 +0000 + ResourceName: UERJ_SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1549695779 + Description: We need to perform further network tests before activating back the site + Severity: Outage + StartTime: Jul 21, 2023 20:00 +0000 + EndTime: Jul 25, 2023 21:00 +0000 + CreatedTime: Jul 21, 2023 19:59 +0000 + ResourceName: UERJ_SQUID + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1549695876 + Description: We need to perform further network tests before activating back the site + Severity: Outage + StartTime: Jul 21, 2023 20:00 +0000 + EndTime: Jul 25, 2023 21:00 +0000 + CreatedTime: Jul 21, 2023 19:59 +0000 + ResourceName: UERJ_SQUID_2 + Services: + - Squid +# --------------------------------------------------------- From 842221005cfc7989e4a726e91efccf1061c0cc2e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 26 Jul 2023 09:09:32 -0500 Subject: [PATCH 052/184] Set CHTC_OSPOOL_ORIGIN to active --- topology/University of Wisconsin/CHTC/CHTC_OSPOOL.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC_OSPOOL.yaml b/topology/University of Wisconsin/CHTC/CHTC_OSPOOL.yaml index 1b8571bac..732dd235c 100644 --- a/topology/University of Wisconsin/CHTC/CHTC_OSPOOL.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC_OSPOOL.yaml @@ -5,7 +5,7 @@ GroupID: 1125 Resources: CHTC_OSPOOL_ORIGIN: - Active: false + Active: true Description: Authenticated origin server for OSPool Users at UW-Madison ID: 1194 ContactLists: From 0f6d2eb4c9f565b445030732975d7222668579ae Mon Sep 17 00:00:00 2001 From: Kenichi Hatakeyama Date: Wed, 26 Jul 2023 11:06:33 -0500 Subject: [PATCH 053/184] Update Baylor-Kodiak_downtime.yaml Short downtime. --- .../Baylor University/Baylor-Kodiak_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml b/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml index e4b6afe0d..a64003da4 100644 --- a/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml +++ b/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml @@ -31,3 +31,14 @@ Services: - CE # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1553875428 + Description: Switching to new server + Severity: Intermittent Outage + StartTime: Jul 26, 2023 16:15 +0000 + EndTime: Jul 26, 2023 16:45 +0000 + CreatedTime: Jul 26, 2023 16:05 +0000 + ResourceName: Baylor-Kodiak-CE + Services: + - CE +# --------------------------------------------------------- From 354fb7db4f1a8659856646e6f57eaf7751e4c841 Mon Sep 17 00:00:00 2001 From: joe-chtc <93614403+joe-chtc@users.noreply.github.com> Date: Wed, 26 Jul 2023 11:52:19 -0500 Subject: [PATCH 054/184] Add ospool-eht AP to CHTC topology --- .../University of Wisconsin/CHTC/CHTC.yaml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index d17b27dc0..8886d45e9 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -502,6 +502,32 @@ Resources: VOOwnership: GLOW: 100 + CHTC-ospool-eht: + Active: true + Description: The CHTC hosted EHT Gateway to the OSPool + ID: 1467 + ContactLists: + Administrative Contact: + Primary: + Name: Brian Lin + ID: OSG1000003 + Security Contact: + Primary: + Name: Brian Lin + ID: OSG1000003 + FQDN: ospool-eht.chtc.wisc.edu + FQDNAliases: + - ospool-eht2000.chtc.wisc.edu + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + CHTC-htcss-dev-ap: Active: true Description: OSPool AP used by the HTCSS dev team From 451005c8b601734bff39d40916c7a69452ea0547 Mon Sep 17 00:00:00 2001 From: joe-chtc <93614403+joe-chtc@users.noreply.github.com> Date: Wed, 26 Jul 2023 12:33:27 -0500 Subject: [PATCH 055/184] Additional contacts for ospool-eht AP --- topology/University of Wisconsin/CHTC/CHTC.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 8886d45e9..b1d24a0fa 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -484,7 +484,6 @@ Resources: Administrative Contact: Primary: Name: Aaron Moate - ID: OSG1000015 Security Contact: Primary: Name: Aaron Moate @@ -511,10 +510,22 @@ Resources: Primary: Name: Brian Lin ID: OSG1000003 + Secondary: + Name: Matyas Selmeci + ID: OSG1000002 + Tertiary: + Name: Joe Bartkowiak + ID: OSG1000141 Security Contact: Primary: Name: Brian Lin ID: OSG1000003 + Secondary: + Name: Matyas Selmeci + ID: OSG1000002 + Tertiary: + Name: Joe Bartkowiak + ID: OSG1000141 FQDN: ospool-eht.chtc.wisc.edu FQDNAliases: - ospool-eht2000.chtc.wisc.edu From 4d66aa89ea40de50b8319ea527a0223afabf87d0 Mon Sep 17 00:00:00 2001 From: joe-chtc <93614403+joe-chtc@users.noreply.github.com> Date: Wed, 26 Jul 2023 12:35:12 -0500 Subject: [PATCH 056/184] Fix Mistake in Prior commit --- topology/University of Wisconsin/CHTC/CHTC.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index b1d24a0fa..53654af59 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -484,6 +484,7 @@ Resources: Administrative Contact: Primary: Name: Aaron Moate + ID: OSG1000015 Security Contact: Primary: Name: Aaron Moate From 28343900aed5ccdccee1ac4bfe9ba4b78ff92517 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Tue, 25 Jul 2023 14:01:23 -0500 Subject: [PATCH 057/184] Add Origin Information to Namespace Endpoint (SOFTWARE-5629) https://opensciencegrid.atlassian.net/browse/SOFTWARE-5629 --- src/stashcache.py | 70 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/src/stashcache.py b/src/stashcache.py index 981a07616..55bfb6cdc 100644 --- a/src/stashcache.py +++ b/src/stashcache.py @@ -1,5 +1,5 @@ from collections import defaultdict -from typing import Dict, List, Optional +from typing import Dict, List, Optional, Literal from webapp.common import is_null, PreJSON, XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER from webapp.exceptions import DataError, ResourceNotRegistered, ResourceMissingService @@ -25,6 +25,9 @@ def _log_or_raise(suppress_errors: bool, an_exception: BaseException, logmethod= def _resource_has_cache(resource: Resource) -> bool: return XROOTD_CACHE_SERVER in resource.service_names +def _resource_has_origin(resource: Resource) -> bool: + return XROOTD_ORIGIN_SERVER in resource.service_names + def _get_resource_with_service(fqdn: Optional[str], service_name: str, topology: Topology, suppress_errors: bool) -> Optional[Resource]: @@ -536,11 +539,17 @@ def get_namespaces_info(global_data: GlobalData) -> PreJSON: """ # Helper functions - def _cache_resource_dict(r: Resource): - endpoint = f"{r.fqdn}:8000" - auth_endpoint = f"{r.fqdn}:8443" + + def _service_resource_dict( + r: Resource, + service_name: Literal[XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER], + auth_port_default: int, + unauth_port_default: int + ): + endpoint = f"{r.fqdn}:{unauth_port_default}" + auth_endpoint = f"{r.fqdn}:{auth_port_default}" for svc in r.services: - if svc.get("Name") == XROOTD_CACHE_SERVER: + if svc.get("Name") == service_name: if not is_null(svc, "Details", "endpoint_override"): endpoint = svc["Details"]["endpoint_override"] if not is_null(svc, "Details", "auth_endpoint_override"): @@ -548,6 +557,12 @@ def _cache_resource_dict(r: Resource): break return {"endpoint": endpoint, "auth_endpoint": auth_endpoint, "resource": r.name} + def _cache_resource_dict(r: Resource): + return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=8443, unauth_port_default=8000) + + def _origin_resource_dict(r: Resource): + return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=1095, unauth_port_default=1094) + def _namespace_dict(ns: Namespace): nsdict = { "path": ns.path, @@ -556,6 +571,7 @@ def _namespace_dict(ns: Namespace): "writebackhost": ns.writeback, "dirlisthost": ns.dirlist, "caches": [], + "origins": [], "credential_generation": get_credential_generation_dict_for_namespace(ns), } @@ -563,26 +579,48 @@ def _namespace_dict(ns: Namespace): if (resource_allows_namespace(cache_resource_obj, ns) and namespace_allows_cache_resource(ns, cache_resource_obj)): nsdict["caches"].append(cache_resource_dicts[cache_name]) + + nsdict["caches"].sort(key=lambda d: d["resource"]) + + for origin_name, origin_resource_obj in origin_resource_objs.items(): + if (resource_allows_namespace(origin_resource_obj, ns) and + namespace_allows_origin_resource(ns, origin_resource_obj)): + nsdict["origins"].append(origin_resource_dicts[origin_name]) + + nsdict["origins"].sort(key=lambda d: d["resource"]) + return nsdict - def _resource_has_downed_cache(r: Resource, t: Topology): + def _resource_has_downed_service( + r: Resource, + t: Topology, + service_name: Literal[XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER] + ): if r.name not in t.present_downtimes_by_resource: return False downtimes = t.present_downtimes_by_resource[r.name] for dt in downtimes: try: - if XROOTD_CACHE_SERVER in dt.service_names: + if service_name in dt.service_names: return True except (KeyError, AttributeError): continue return False + def _resource_has_downed_cache(r: Resource, t: Topology): + return _resource_has_downed_service(r, t, XROOTD_CACHE_SERVER) + + def _resource_has_downed_origin(r: Resource, t: Topology): + return _resource_has_downed_service(r, t, XROOTD_ORIGIN_SERVER) + # End helper functions topology = global_data.get_topology() resource_groups: List[ResourceGroup] = topology.get_resource_group_list() vos_data = global_data.get_vos_data() + # Build a dict of cache resources + cache_resource_objs = {} # type: Dict[str, Resource] cache_resource_dicts = {} # type: Dict[str, Dict] @@ -595,12 +633,26 @@ def _resource_has_downed_cache(r: Resource, t: Topology): cache_resource_objs[resource.name] = resource cache_resource_dicts[resource.name] = _cache_resource_dict(resource) + # Build a dict of origin resources + + origin_resource_objs = {} # type: Dict[str, Resource] + origin_resource_dicts = {} # type: Dict[str, Dict] + + for group in resource_groups: + for resource in group.resources: + if (_resource_has_origin(resource) + and resource.is_active + and not _resource_has_downed_origin(resource, topology) + ): + origin_resource_objs[resource.name] = resource + origin_resource_dicts[resource.name] = _origin_resource_dict(resource) + result_namespaces = [] for stashcache_obj in vos_data.stashcache_by_vo_name.values(): for namespace in stashcache_obj.namespaces.values(): result_namespaces.append(_namespace_dict(namespace)) return PreJSON({ - "caches": list(cache_resource_dicts.values()), - "namespaces": result_namespaces + "caches": sorted(list(cache_resource_dicts.values()), key=lambda x: x["resource"]), + "namespaces": sorted(result_namespaces, key=lambda x: x["path"]) }) From 9078f6d543b9097030b232dbeca7b1518eebf088 Mon Sep 17 00:00:00 2001 From: Cannon Lock Date: Wed, 26 Jul 2023 14:53:07 -0500 Subject: [PATCH 058/184] Remove use of Literal type (SOFTWARE-5629) https://opensciencegrid.atlassian.net/browse/SOFTWARE-5629 --- src/stashcache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stashcache.py b/src/stashcache.py index 55bfb6cdc..838bf90c0 100644 --- a/src/stashcache.py +++ b/src/stashcache.py @@ -1,5 +1,5 @@ from collections import defaultdict -from typing import Dict, List, Optional, Literal +from typing import Dict, List, Optional from webapp.common import is_null, PreJSON, XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER from webapp.exceptions import DataError, ResourceNotRegistered, ResourceMissingService @@ -542,7 +542,7 @@ def get_namespaces_info(global_data: GlobalData) -> PreJSON: def _service_resource_dict( r: Resource, - service_name: Literal[XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER], + service_name, auth_port_default: int, unauth_port_default: int ): @@ -594,7 +594,7 @@ def _namespace_dict(ns: Namespace): def _resource_has_downed_service( r: Resource, t: Topology, - service_name: Literal[XROOTD_CACHE_SERVER, XROOTD_ORIGIN_SERVER] + service_name ): if r.name not in t.present_downtimes_by_resource: return False From 9048a1a949b1212768e1445a98c9e3f7bacdb6ce Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 27 Jul 2023 12:53:47 -0500 Subject: [PATCH 059/184] add new ap40 host to replace ap7, mark ap7 as inactive, and tag submit nodes as OSPool --- .../University of Wisconsin/CHTC/CHTC.yaml | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 53654af59..4b80532cd 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -63,6 +63,8 @@ Resources: Description: OSG Submission Node Details: hidden: false + Tags: + - OSPool VOOwnership: GLOW: 100 CHTC-submit2: @@ -84,6 +86,8 @@ Resources: Description: OSG Submission Node Details: hidden: false + Tags: + - OSPool VOOwnership: GLOW: 100 @@ -106,6 +110,8 @@ Resources: Description: OSG Submission Node Details: hidden: false + Tags: + - OSPool VOOwnership: GLOW: 100 @@ -477,7 +483,7 @@ Resources: Description: OSG VO backfill containers on the Tiger cluster CHTC-ap7: - Active: true + Active: false Description: The ap7.chtc.wisc.edu login node for the OSG Open Pool ID: 1303 ContactLists: @@ -502,6 +508,30 @@ Resources: VOOwnership: GLOW: 100 + CHTC-ap40: + Active: true + Description: The ap40.chtc.wisc.edu login node for the OSG Open Pool + ID: 1303 + ContactLists: + Administrative Contact: + Primary: + Name: Aaron Moate + ID: OSG1000015 + Security Contact: + Primary: + Name: Aaron Moate + ID: OSG1000015 + FQDN: ap40.chtc.wisc.edu + Services: + Submit Node: + Description: OS Pool access point + Details: + hidden: false + Tags: + - OSPool + VOOwnership: + GLOW: 100 + CHTC-ospool-eht: Active: true Description: The CHTC hosted EHT Gateway to the OSPool From 6fdfbf7798b4f9bf58279884544ab10c5d23ef2f Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 27 Jul 2023 10:54:12 -0700 Subject: [PATCH 060/184] Adding cache to LIGO Adding the SINGAPORE_INTERNET2_OSDF_CACHE to LIGO. --- virtual-organizations/LIGO.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virtual-organizations/LIGO.yaml b/virtual-organizations/LIGO.yaml index f6ef8efcd..b3e0f830d 100644 --- a/virtual-organizations/LIGO.yaml +++ b/virtual-organizations/LIGO.yaml @@ -120,6 +120,7 @@ DataFederations: - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE + - SINGAPORE_INTERNET2_OSDF_CACHE - Path: /igwn/virgo Authorizations: - FQAN: /osg/ligo @@ -165,6 +166,7 @@ DataFederations: - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE + - SINGAPORE_INTERNET2_OSDF_CACHE - Path: /igwn/ligo Authorizations: - FQAN: /osg/ligo @@ -210,6 +212,7 @@ DataFederations: - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE + - SINGAPORE_INTERNET2_OSDF_CACHE - Path: /igwn/shared Authorizations: - FQAN: /osg/ligo @@ -255,6 +258,7 @@ DataFederations: - LONDON_ESNET_OSDF_CACHE - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE + - SINGAPORE_INTERNET2_OSDF_CACHE - Path: /gwdata Authorizations: - PUBLIC From 86d59b1ce29fb14edae90ae391201a752150fc6f Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 27 Jul 2023 12:59:18 -0500 Subject: [PATCH 061/184] update ap40 resource id --- 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 4b80532cd..e888d2b8c 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -511,7 +511,7 @@ Resources: CHTC-ap40: Active: true Description: The ap40.chtc.wisc.edu login node for the OSG Open Pool - ID: 1303 + ID: 1468 ContactLists: Administrative Contact: Primary: From 5fdae7c6a973203475d05fa08e92fac3071ada3e Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Thu, 27 Jul 2023 13:41:59 -0500 Subject: [PATCH 062/184] Create RIT_Tu.yaml --- projects/RIT_Tu.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/RIT_Tu.yaml diff --git a/projects/RIT_Tu.yaml b/projects/RIT_Tu.yaml new file mode 100644 index 000000000..ba5338f52 --- /dev/null +++ b/projects/RIT_Tu.yaml @@ -0,0 +1,5 @@ +Description: Study on Solid State Battery Cathode Optimization +Department: Mechanical Engineering +FieldOfScience: Mechanical Engineering +Organization: Rochester Institute of Technology +PIName: Howard Tu From a9bcb18b9335af474c897d3d1bba980760465587 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 27 Jul 2023 16:17:07 -0500 Subject: [PATCH 063/184] Updates fqdn for ND Caml GPU --- topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml index 16293cc54..1b02723ad 100644 --- a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml +++ b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml @@ -14,7 +14,7 @@ Resources: ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. - FQDN: hosted-ce35.grid.uchicago.edu + FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org ID: 265 Services: CE: @@ -47,7 +47,7 @@ Resources: ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. - FQDN: hosted-ce35.opensciencegrid.org + FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org ID: 1077 Services: CE: From 4782baf1c76db021434b4bd9504c6b5f4621f7b4 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 1 Aug 2023 11:30:57 -0500 Subject: [PATCH 064/184] Create UNI_staff.yaml --- projects/UNI_staff.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/UNI_staff.yaml diff --git a/projects/UNI_staff.yaml b/projects/UNI_staff.yaml new file mode 100644 index 000000000..6a7836363 --- /dev/null +++ b/projects/UNI_staff.yaml @@ -0,0 +1,5 @@ +Description: Will be using OSPool to evaluate and develop training for UNI users. +Department: Information Technology, Network & Infrastructure Services +FieldOfScience: Training +Organization: University of Northern Iowa +PIName: Wesley Jones From 47ac26760074e5629c0502b1dac51fd5b7c9ff17 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 1 Aug 2023 12:31:32 -0500 Subject: [PATCH 065/184] Rename UNI_staff.yaml to UNI_Staff.yaml --- projects/{UNI_staff.yaml => UNI_Staff.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename projects/{UNI_staff.yaml => UNI_Staff.yaml} (100%) diff --git a/projects/UNI_staff.yaml b/projects/UNI_Staff.yaml similarity index 100% rename from projects/UNI_staff.yaml rename to projects/UNI_Staff.yaml From dff5493eb106f52394879a184bfd9f9c3e348a44 Mon Sep 17 00:00:00 2001 From: Nicholas Von Wolff Date: Tue, 1 Aug 2023 12:58:28 -0600 Subject: [PATCH 066/184] Add downtime for NMSU-Discovery-CE1 due to maintenance --- .../NMSU_DISCOVERY_downtime.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/topology/New Mexico State University/New Mexico State Discovery/NMSU_DISCOVERY_downtime.yaml b/topology/New Mexico State University/New Mexico State Discovery/NMSU_DISCOVERY_downtime.yaml index 56258fee8..f5153f00d 100644 --- a/topology/New Mexico State University/New Mexico State Discovery/NMSU_DISCOVERY_downtime.yaml +++ b/topology/New Mexico State University/New Mexico State Discovery/NMSU_DISCOVERY_downtime.yaml @@ -48,4 +48,14 @@ ResourceName: SLATE_US_NMSU_DISCOVERY Services: - CE +- Class: SCHEDULED + ID: 1559162036 + Description: Biannual Maintenance + Severity: Outage + StartTime: Aug 01, 2023 15:00 +0000 + EndTime: Aug 16, 2023 06:59 +0000 + CreatedTime: Aug 01, 2023 18:56 +0000 + ResourceName: NMSU-Discovery-CE1 + Services: + - CE # --------------------------------------------------------- From 74a6995cb5803ca9429037194986b03ad9792988 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Wed, 2 Aug 2023 13:27:29 -0500 Subject: [PATCH 067/184] Create MOLLER.yaml Creating file for the MOLLER experiment at Jefferson Lab --- MOLLER.yaml | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 MOLLER.yaml diff --git a/MOLLER.yaml b/MOLLER.yaml new file mode 100644 index 000000000..96610eb1a --- /dev/null +++ b/MOLLER.yaml @@ -0,0 +1,119 @@ +# Name is the short name of the VO +Name: MOLLER +# LongName is the full name of the VO +LongName: The Measurement of a Lepton-Lepton Electroweak Reaction +# AppDescription is a brief description of the VO +AppDescription: MOLLER Simulation and Data Analysis +# Community is the description of the community the VO belongs to +Community: The MOLLER Collaboration + +CertificateOnly: false + +# If you have an up-to-date local git clone, fill ID with the output from `bin/next_virtual_organization_id` +# Otherwise, leave it blank and we will fill in the appropriate value for you. +ID: + +# Contacts contain information about people to contact regarding this VO. +# The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml +# If you cannot find the contact in the above XML, please register the contact: +# https://opensciencegrid.org/docs/common/registration/#registering-contacts +Contacts: + # Administrative Contact is a list of people to contact regarding administrative issues + Administrative Contact: + - ID: + Name: + # - ... + + # Security Contact is a list of people to contact regarding security issues + Security Contact: + - ID: + Name: + # - ... + + ### Registration Authority (optional) is a list of people to contact regarding registration issues + # Registration Authority: + # - ID: + # Name: + # - ... + + ### VO Manager (optional) is the list of people who manage this VO + # VO Manager: + # - ID: + # Name: + # - ... + +### Credentials (optional) define mappings of auth methods to Unix users for this VO +# Credentials: +##### TokenIssuers (optional) is a list of mappings for SciTokens issuers +# # TokenIssuers: +# ### URL is the https URL of your scitokens issuer, e.g. https://scitokens.org/ +# ### DefaultUnixUser is a username that jobs with tokens issued by this issuer should map to +# ### Description (optional) is human-readable text describing the mapping +# ### Subject (optional) is a token subject to restrict this mapping to +# # - URL: +# # DefaultUnixUser: +# # Description: +# # Subject: + +FieldsOfScience: + + # PrimaryFields are the fields of science this VO mostly deals with + PrimaryFields: + - Particle Physics + + ### SecondaryFields (optional) are fields of science this VO occasionally deals with + # SecondaryFields: + # - + # - ... + +# PrimaryURL is for general information about the VO +PrimaryURL: https://moller.jlab.org/moller_root/ +# PurposeURL explains the VO's purpose +PurposeURL: https://moller.jlab.org/moller_root/ +# SupportURL is for support issues +SupportURL: https://moller.jlab.org/wiki/index.php/Main_Page + +### ReportingGroups (optional) is a list of groups this VO reports to +# ReportingGroups: +# - +# - ... + +### OASIS (optional) is information about OASIS usage by the VO +# OASIS: +##### UseOASIS is true if this VO uses space on OASIS +# UseOASIS: true +# +####### Managers (optional) are one or more people with manager access to this VO's OASIS space +# # Managers: +# # - Name: +# # # DNs are one or more DNs for this manager's cert(s) +# # DNs: +# # - +# # - ... +# # ... +# +####### OASISRepoURLs (optional) are one or more URLs for OASIS repositories +####### owned by this VO (https://opensciencegrid.org/docs/data/external-oasis-repos/) +# # OASISRepoURLs: +# # - +# # - ... + +### DataFederations (optional) is information about data federations that the VO is part of +### This template is for the StashCache data federation; for instructions, +### see the documentation at https://opensciencegrid.org/docs/data/stashcache/vo-data/ +# DataFederations: +# StashCache: +# Namespaces: +# - Path: //PUBLIC: +# Authorizations: +# - PUBLIC +# AllowedOrigins: +# - +# - ... +### For AllowedCaches, if you only have public data, use: +# AllowedCaches: +# - ANY +### otherwise use: +# AllowedCaches: +# - +# - ... From e433610083a0c3c58f7e743074fb622efda15a8b Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Wed, 2 Aug 2023 16:59:58 -0500 Subject: [PATCH 068/184] Moves migrated CE to seperate topology entry --- .../ND_CAML/ND_CAMLGPU.yaml | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml index 1b02723ad..d069c5ccb 100644 --- a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml +++ b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml @@ -14,7 +14,7 @@ Resources: ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. - FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org + FQDN: hosted-ce35.grid.uchicago.edu ID: 265 Services: CE: @@ -47,7 +47,7 @@ Resources: ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. - FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org + FQDN: hosted-ce35.grid.uchicago.edu ID: 1077 Services: CE: @@ -68,4 +68,37 @@ Resources: KSI2KMin: 100 StorageCapacityMax: 4 StorageCapacityMin: 1 + ND-CAML-GPU-CE1: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d + Name: Marco Mascheroni + Security Contact: + Primary: + ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d + Name: Marco Mascheroni + Description: GPU Cluster at Notre Dame. + FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org + ID: + Services: + CE: + Description: Compute Element + Details: + hidden: false + Tags: + - CC* + VOOwnership: + CMS: 100 + WLCGInformation: + APELNormalFactor: 0 + HEPSPEC: 85 + InteropAccounting: false + InteropBDII: true + InteropMonitoring: true + KSI2KMax: 500 + KSI2KMin: 100 + StorageCapacityMax: 4 + StorageCapacityMin: 1 SupportCenter: NWICG From ea4faf2baf7339f6af5f04a32ce497743c308516 Mon Sep 17 00:00:00 2001 From: Eric Appelt Date: Wed, 2 Aug 2023 20:36:30 -0500 Subject: [PATCH 069/184] Create T2_US_Vanderbilt Scheduled August 2023 Downtime --- .../Vanderbilt ACCRE/Vanderbilt_downtime.yaml | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/topology/Vanderbilt University/Vanderbilt ACCRE/Vanderbilt_downtime.yaml b/topology/Vanderbilt University/Vanderbilt ACCRE/Vanderbilt_downtime.yaml index 232f0d6ff..31ac73b45 100644 --- a/topology/Vanderbilt University/Vanderbilt ACCRE/Vanderbilt_downtime.yaml +++ b/topology/Vanderbilt University/Vanderbilt ACCRE/Vanderbilt_downtime.yaml @@ -583,4 +583,44 @@ ResourceName: Vanderbilt_Xrootd Services: - XRootD component - +# ---------------------------------------------------------- +- Class: SCHEDULED + ID: 1559162037 + Description: Network upgrades + Severity: Outage + StartTime: Aug 8, 2023 05:00 +0000 + EndTime: Aug 11, 2023 05:00 +0000 + CreatedTime: Aug 3, 2023 02:00 +0000 + ResourceName: Vanderbilt_Gridftp + Services: + - GridFtp +- Class: SCHEDULED + ID: 1559162038 + Description: Network upgrades + Severity: Outage + StartTime: Aug 8, 2023 05:00 +0000 + EndTime: Aug 11, 2023 05:00 +0000 + CreatedTime: Aug 3, 2023 02:00 +0000 + ResourceName: Vanderbilt_CE5 + Services: + - CE +- Class: SCHEDULED + ID: 1559162039 + Description: Network upgrades + Severity: Outage + StartTime: Aug 8, 2023 05:00 +0000 + EndTime: Aug 11, 2023 05:00 +0000 + CreatedTime: Aug 3, 2023 02:00 +0000 + ResourceName: Vanderbilt_CE6 + Services: + - CE +- Class: SCHEDULED + ID: 1559162040 + Description: Network upgrades + Severity: Outage + StartTime: Aug 8, 2023 05:00 +0000 + EndTime: Aug 11, 2023 05:00 +0000 + CreatedTime: Aug 3, 2023 02:00 +0000 + ResourceName: Vanderbilt_Xrootd + Services: + - XRootD component From abb39ec38dbda97b965323752dfb2c8945892c03 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 3 Aug 2023 08:05:44 -0500 Subject: [PATCH 070/184] Adds Resource ID for ND-CAML-GPU-CE1 --- topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml index d069c5ccb..11a05f40f 100644 --- a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml +++ b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml @@ -81,7 +81,7 @@ Resources: Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org - ID: + ID: 1468 Services: CE: Description: Compute Element From d1d85a83c1c2d0aa4dbd3bd057ad11875cfd3692 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 3 Aug 2023 08:10:10 -0500 Subject: [PATCH 071/184] Fixes accidentally changed FQDN for ND-Caml --- topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml index 11a05f40f..40daee6cd 100644 --- a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml +++ b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml @@ -47,7 +47,7 @@ Resources: ID: 030408ab932e143859b5f97a2d1c9e30ba2a9f0d Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. - FQDN: hosted-ce35.grid.uchicago.edu + FQDN: hosted-ce35.opensciencegrid.org ID: 1077 Services: CE: From 4c0aad989733e93f2b4808bd9b1004c909a627cb Mon Sep 17 00:00:00 2001 From: Steve Anthony Date: Thu, 3 Aug 2023 10:53:52 -0400 Subject: [PATCH 072/184] Update Lehigh - Hawk_downtime.yaml Add downtime for LEHIGH-HAWK-CE due to scheduled maintenance. --- .../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 fb231c5da..cc9483b63 100644 --- a/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml +++ b/topology/Lehigh University/Lehigh - Hawk/Lehigh - Hawk_downtime.yaml @@ -75,4 +75,15 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1560742322 + Description: Scheduled cluster maintenance + Severity: Outage + StartTime: Aug 08, 2023 14:00 +0000 + EndTime: Aug 08, 2023 16:00 +0000 + CreatedTime: Aug 03, 2023 14:50 +0000 + ResourceName: LEHIGH-HAWK-CE + Services: + - CE +# --------------------------------------------------------- From 2db559b8dfef650c12cd4a22ba0b459f73c9023a Mon Sep 17 00:00:00 2001 From: mwestphall Date: Thu, 3 Aug 2023 09:58:24 -0500 Subject: [PATCH 073/184] Update ap40 FQDN Co-authored-by: Matyas Selmeci Co-authored-by: Brian Lin --- topology/University of Wisconsin/CHTC/CHTC.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index e888d2b8c..3bbaa3678 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -510,7 +510,7 @@ Resources: CHTC-ap40: Active: true - Description: The ap40.chtc.wisc.edu login node for the OSG Open Pool + Description: The ap40.uw.osg-htc.org access point for the Open Science Pool ID: 1468 ContactLists: Administrative Contact: @@ -522,6 +522,9 @@ Resources: Name: Aaron Moate ID: OSG1000015 FQDN: ap40.chtc.wisc.edu + FQDNAliases: + - ap2007.chtc.wisc.edu + - ospool-ap2040.chtc.wisc.edu Services: Submit Node: Description: OS Pool access point @@ -530,7 +533,7 @@ Resources: Tags: - OSPool VOOwnership: - GLOW: 100 + OSG: 100 CHTC-ospool-eht: Active: true From c4c8d9fdbd59fa3fbc6a2d59577c818d1631c45f Mon Sep 17 00:00:00 2001 From: cjabplanalp <99278354+cjabplanalp@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:06:23 -0500 Subject: [PATCH 074/184] UWMadison projects --- projects/UWMadison_Ericksen.yaml | 5 +++++ projects/UWMadison_Kwan.yaml | 5 +++++ projects/UWMadison_Pool.yaml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 projects/UWMadison_Ericksen.yaml create mode 100644 projects/UWMadison_Kwan.yaml diff --git a/projects/UWMadison_Ericksen.yaml b/projects/UWMadison_Ericksen.yaml new file mode 100644 index 000000000..e6c51c67d --- /dev/null +++ b/projects/UWMadison_Ericksen.yaml @@ -0,0 +1,5 @@ +Department: Small Molecule Screening Facility +Description: http://hts.wisc.edu/ +FieldOfScience: Health +Organization: University of Wisconsin-Madison +PIName: Spencer Ericksen diff --git a/projects/UWMadison_Kwan.yaml b/projects/UWMadison_Kwan.yaml new file mode 100644 index 000000000..f4de557db --- /dev/null +++ b/projects/UWMadison_Kwan.yaml @@ -0,0 +1,5 @@ +Department: Pharmacy +Description: '' +FieldOfScience: Health +Organization: University of Wisconsin-Madison +PIName: Jason Kwan diff --git a/projects/UWMadison_Pool.yaml b/projects/UWMadison_Pool.yaml index 25ca2e983..36c305aab 100644 --- a/projects/UWMadison_Pool.yaml +++ b/projects/UWMadison_Pool.yaml @@ -1,4 +1,4 @@ -Department: Genetics +Department: Genomics & Genetics Description: http://www.genetics.wisc.edu/user/338 FieldOfScience: Biological Sciences Organization: University of Wisconsin-Madison From e8e1d692e54169708779b42ffe3ee9316bb137e4 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 3 Aug 2023 12:06:05 -0500 Subject: [PATCH 075/184] Bump resource ID --- topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml index 40daee6cd..2c2532c3b 100644 --- a/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml +++ b/topology/University of Notre Dame/ND_CAML/ND_CAMLGPU.yaml @@ -81,7 +81,7 @@ Resources: Name: Marco Mascheroni Description: GPU Cluster at Notre Dame. FQDN: nd-caml-gpu-ce1.svc.opensciencegrid.org - ID: 1468 + ID: 1469 Services: CE: Description: Compute Element From fda6f8fb8736a9336268c83d29f04b7f63c71c76 Mon Sep 17 00:00:00 2001 From: Christina Koch Date: Thu, 3 Aug 2023 13:26:13 -0500 Subject: [PATCH 076/184] adding project descriptions --- projects/UWMadison_Ericksen.yaml | 2 +- projects/UWMadison_Kwan.yaml | 2 +- projects/UWMadison_Pool.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/UWMadison_Ericksen.yaml b/projects/UWMadison_Ericksen.yaml index e6c51c67d..a7d2bbbdc 100644 --- a/projects/UWMadison_Ericksen.yaml +++ b/projects/UWMadison_Ericksen.yaml @@ -1,5 +1,5 @@ Department: Small Molecule Screening Facility -Description: http://hts.wisc.edu/ +Description: Molecule docking as part of drug discovery research (http://hts.wisc.edu/) FieldOfScience: Health Organization: University of Wisconsin-Madison PIName: Spencer Ericksen diff --git a/projects/UWMadison_Kwan.yaml b/projects/UWMadison_Kwan.yaml index f4de557db..585384311 100644 --- a/projects/UWMadison_Kwan.yaml +++ b/projects/UWMadison_Kwan.yaml @@ -1,5 +1,5 @@ Department: Pharmacy -Description: '' +Description: 'Bioactive molecules from cultured and uncultured bacteria (https://kwanlab.github.io/)' FieldOfScience: Health Organization: University of Wisconsin-Madison PIName: Jason Kwan diff --git a/projects/UWMadison_Pool.yaml b/projects/UWMadison_Pool.yaml index 36c305aab..d5c9a0e22 100644 --- a/projects/UWMadison_Pool.yaml +++ b/projects/UWMadison_Pool.yaml @@ -1,5 +1,5 @@ Department: Genomics & Genetics -Description: http://www.genetics.wisc.edu/user/338 +Description: 'Population Genomics and the Genetic Basis of Adaptive Evolution - http://www.genetics.wisc.edu/user/338' FieldOfScience: Biological Sciences Organization: University of Wisconsin-Madison PIName: John Pool From b0c3bc99d95e8ef5aa4e5f03c126f6128a8d9993 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 3 Aug 2023 12:01:14 -0700 Subject: [PATCH 077/184] Create SingARENSingaporeInfrastructure_downtime.yaml Add downtime for SINGAPORE_INTERNET2_OSDF_CACHE due to the node being processed to be sent to DC. --- .../SingARENSingaporeInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml diff --git a/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml new file mode 100644 index 000000000..6aebec74a --- /dev/null +++ b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1560891865 + Description: going to DC + Severity: Outage + StartTime: Aug 03, 2023 19:30 +0000 + EndTime: Aug 31, 2023 19:39 +0000 + CreatedTime: Aug 03, 2023 18:59 +0000 + ResourceName: SINGAPORE_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 6e5b84762c07d55002391db62061c916f821833a Mon Sep 17 00:00:00 2001 From: wenjing wu <44483146+wuwj6269@users.noreply.github.com> Date: Sat, 5 Aug 2023 21:10:04 -0400 Subject: [PATCH 078/184] Update AGLT2_downtime.yaml --- topology/University of Michigan/AGLT2/AGLT2_downtime.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml index 6c830424b..6c440d65b 100644 --- a/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml +++ b/topology/University of Michigan/AGLT2/AGLT2_downtime.yaml @@ -1132,3 +1132,4 @@ Services: - Squid # --------------------------------------------------------- + From b7dc337050defbb23329fda3b3bd7799ca77f9c9 Mon Sep 17 00:00:00 2001 From: Robert Sand Date: Tue, 8 Aug 2023 11:55:16 -0400 Subject: [PATCH 079/184] Create SITE.yaml --- topology/Penn State University/PSU RC/SITE.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 topology/Penn State University/PSU RC/SITE.yaml diff --git a/topology/Penn State University/PSU RC/SITE.yaml b/topology/Penn State University/PSU RC/SITE.yaml new file mode 100644 index 000000000..b80378919 --- /dev/null +++ b/topology/Penn State University/PSU RC/SITE.yaml @@ -0,0 +1,7 @@ +City: University Park +Country: United States +ID: 10035 +Latitude: 40.806956 +Longitude: -77.86281 +State: PA +Zipcode: '16802' From a6ff7bb2b7e432ebb3be02e6a8a0de11bb340006 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 8 Aug 2023 12:51:48 -0500 Subject: [PATCH 080/184] Add downtime for various Georgia Tech resources (FD 74001) --- .../Georgia Tech PACE OSG 2_downtime.yaml | 117 +++++++++++++++++- 1 file changed, 114 insertions(+), 3 deletions(-) diff --git a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml index c16de5d64..29fc2ef40 100644 --- a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml +++ b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml @@ -504,6 +504,117 @@ Services: - CE # --------------------------------------------------------- - - - +- Class: SCHEDULED + ID: 1564520488 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_LIGO_Submit_1 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564520489 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_PACE_CE_1 + Services: + - CE + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564520490 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_PACE_GridFTP + Services: + - GridFtp + - XRootD cache server +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521022 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_LIGO_Submit_2 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521023 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_CE_2 + Services: + - CE + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521024 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_CE_ICECUBE + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521025 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_CE_LIGO + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521026 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_CE_OSG + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521027 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_GridFTP2 + Services: + - GridFtp + - XRootD cache server +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564521028 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:48 +0000 + ResourceName: Georgia_Tech_PACE_perfSONAR_BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- From 2390c9a90ef76fd0f843055655d2c1ca73299341 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 8 Aug 2023 12:57:06 -0500 Subject: [PATCH 081/184] Move new downtimes to correct file --- .../Georgia Tech PACE OSG 2_downtime.yaml | 35 ------------------- .../Georgia Tech PACE_downtime.yaml | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml index 29fc2ef40..9758006d6 100644 --- a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml +++ b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE OSG 2_downtime.yaml @@ -504,41 +504,6 @@ Services: - CE # --------------------------------------------------------- -- Class: SCHEDULED - ID: 1564520488 - Description: Sitewide maintenance - Severity: Intermittent Outage - StartTime: Aug 08, 2023 12:00 +0000 - EndTime: Aug 11, 2023 00:00 +0000 - CreatedTime: Aug 07, 2023 23:47 +0000 - ResourceName: Georgia_Tech_LIGO_Submit_1 - Services: - - Submit Node -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1564520489 - Description: Sitewide maintenance - Severity: Intermittent Outage - StartTime: Aug 08, 2023 12:00 +0000 - EndTime: Aug 11, 2023 00:00 +0000 - CreatedTime: Aug 07, 2023 23:47 +0000 - ResourceName: Georgia_Tech_PACE_CE_1 - Services: - - CE - - Squid -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1564520490 - Description: Sitewide maintenance - Severity: Intermittent Outage - StartTime: Aug 08, 2023 12:00 +0000 - EndTime: Aug 11, 2023 00:00 +0000 - CreatedTime: Aug 07, 2023 23:47 +0000 - ResourceName: Georgia_Tech_PACE_GridFTP - Services: - - GridFtp - - XRootD cache server -# --------------------------------------------------------- - Class: SCHEDULED ID: 1564521022 Description: Sitewide maintenance diff --git a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE_downtime.yaml b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE_downtime.yaml index 91068e72c..fb5027ff8 100644 --- a/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE_downtime.yaml +++ b/topology/Georgia Institute of Technology/Georgia Tech/Georgia Tech PACE_downtime.yaml @@ -503,3 +503,38 @@ - GridFtp - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564520488 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_LIGO_Submit_1 + Services: + - Submit Node +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564520489 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_PACE_CE_1 + Services: + - CE + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1564520490 + Description: Sitewide maintenance + Severity: Intermittent Outage + StartTime: Aug 08, 2023 12:00 +0000 + EndTime: Aug 11, 2023 00:00 +0000 + CreatedTime: Aug 07, 2023 23:47 +0000 + ResourceName: Georgia_Tech_PACE_GridFTP + Services: + - GridFtp + - XRootD cache server +# --------------------------------------------------------- From 6e9a36b11abfeea119d566358508ba41083edf4f Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 8 Aug 2023 13:45:56 -0500 Subject: [PATCH 082/184] Disable CHTC-ITB-SLURM-CE (retired) --- topology/University of Wisconsin/CHTC/CHTC-ITB.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml index 2f94b9a96..e1c3f05a5 100644 --- a/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC-ITB.yaml @@ -123,7 +123,7 @@ Resources: hidden: false CHTC-ITB-SLURM-CE: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From 2e0233565daad126c073adc82cd47e9be9704071 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 8 Aug 2023 16:02:27 -0700 Subject: [PATCH 083/184] Create UCSD.yaml Creating the UCSD VO --- virtual-organizations/UCSD.yaml | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 virtual-organizations/UCSD.yaml diff --git a/virtual-organizations/UCSD.yaml b/virtual-organizations/UCSD.yaml new file mode 100644 index 000000000..1b5418235 --- /dev/null +++ b/virtual-organizations/UCSD.yaml @@ -0,0 +1,44 @@ +AppDescription: This VO supports multiple sciences on UCSD +CertificateOnly: false +Community: The UCSD VO will support users and experiments from UCSD. +Contacts: + Administrative Contact: + - ID: OSG1000162 + Name: Fabio Andrijauskas + Security Contact: + - ID: OSG1000162 + Name: Fabio Andrijauskas + Sponsors: + - ID: c412f5f57dca8fe5c73fb3bc4e86bcf243e9edf7 + Name: Frank Wuerthwein + VO Manager: + - ID: OSG1000162 + Name: Fabio Andrijauskas +Credentials: + TokenIssuers: + - URL: https://scitokens.org/ucsd + DefaultUnixUser: ucsd +Disable: false +FieldsOfScience: + PrimaryFields: + - Multi-Science Community +ID: 234 +LongName: UCSD multiple sciences origin + + +DataFederations: + StashCache: + Namespaces: + - Path: /ucsd + Authorizations: + Authorizations: + - PUBLIC + - SciTokens: + Issuer: https://token.nationalresearchplatform.org/ucsd + Base Path: /ucsd/physics + Map Subject: False + - PUBLIC + AllowedOrigins: + - SDSC_NRP_OSDF_ORIGIN + AllowedCaches: + - ANY From 738fd259e397b47c162aab3fa0db6e4da1393b93 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 8 Aug 2023 16:08:30 -0700 Subject: [PATCH 084/184] fixing indention --- virtual-organizations/UCSD.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/virtual-organizations/UCSD.yaml b/virtual-organizations/UCSD.yaml index 1b5418235..13f25c533 100644 --- a/virtual-organizations/UCSD.yaml +++ b/virtual-organizations/UCSD.yaml @@ -31,13 +31,11 @@ DataFederations: Namespaces: - Path: /ucsd Authorizations: - Authorizations: - - PUBLIC - - SciTokens: + - SciTokens: Issuer: https://token.nationalresearchplatform.org/ucsd Base Path: /ucsd/physics Map Subject: False - - PUBLIC + - PUBLIC AllowedOrigins: - SDSC_NRP_OSDF_ORIGIN AllowedCaches: From 779dfd8715ab36f572cdbab1e4fd508e4540f88c Mon Sep 17 00:00:00 2001 From: Jadir Marra da Silva Date: Wed, 9 Aug 2023 14:00:51 -0300 Subject: [PATCH 085/184] Update SPRACE_downtime.yaml --- .../SPRACE/SPRACE_downtime.yaml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml index 50520c674..731dd34be 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml @@ -2433,3 +2433,69 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003784 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: BR-Sprace BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003785 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: BR-Sprace LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003786 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: SPRACE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003787 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: SPRACE-SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003788 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: T2_BR_SPRACE-squid1 + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566003789 + Description: network outage + Severity: Outage + StartTime: Aug 09, 2023 15:30 +0000 + EndTime: Aug 09, 2023 21:00 +0000 + CreatedTime: Aug 09, 2023 16:59 +0000 + ResourceName: T2_BR_SPRACE-squid2 + Services: + - Squid +# --------------------------------------------------------- From 85855a786fb3cd41cce80cfa049f4f69d6fb537a Mon Sep 17 00:00:00 2001 From: Robert Sand Date: Wed, 9 Aug 2023 13:39:34 -0400 Subject: [PATCH 086/184] Create PSU-submit.yaml Adding our first Access Point into the topology --- .../PSU RC/PSU-submit.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 topology/Penn State University/PSU RC/PSU-submit.yaml diff --git a/topology/Penn State University/PSU RC/PSU-submit.yaml b/topology/Penn State University/PSU RC/PSU-submit.yaml new file mode 100644 index 000000000..f2e613d79 --- /dev/null +++ b/topology/Penn State University/PSU RC/PSU-submit.yaml @@ -0,0 +1,38 @@ +Production: true +SupportCenter: Self Supported +GroupDescription: This is an OSPool Access Point on our RC Cluster +GroupID: + +Resources: + PSU-Submit01: + Active: false + Description: This is an OSPool Access Point for PSU RC. + ID: + ContactLists: + Administrative Contact: + Primary: + Name: Robert Sand + ID: OSG1000504 + Secondary: + Name: Chad Bahrmann + ID: OSG1000509 + Tertiary: + Name: Gary Skouson + ID: OSG1000506 + + Security Contact: + Primary: + Name: Robert Sand + ID: OSG1000504 + Secondary: + Name: Chad Bahrmann + ID: OSG1000509 + Tertiary: + Name: Gary Skouson + ID: OSG1000506 + + FQDN: submit01.hpc.psu.edu + # valid services are listed in topology/services.yaml with the format ": " + Services: + Submit Node: 109 + Description: An OSPool Access Point to submit Jobs to the PSU LIGO Site. From 4aa15029c9735badf10d5dc7418a3da7a22ec214 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 9 Aug 2023 12:50:06 -0500 Subject: [PATCH 087/184] Add IDs --- topology/Penn State University/PSU RC/PSU-submit.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Penn State University/PSU RC/PSU-submit.yaml b/topology/Penn State University/PSU RC/PSU-submit.yaml index f2e613d79..d9f4e44d8 100644 --- a/topology/Penn State University/PSU RC/PSU-submit.yaml +++ b/topology/Penn State University/PSU RC/PSU-submit.yaml @@ -1,13 +1,13 @@ Production: true SupportCenter: Self Supported GroupDescription: This is an OSPool Access Point on our RC Cluster -GroupID: +GroupID: 1364 Resources: PSU-Submit01: Active: false Description: This is an OSPool Access Point for PSU RC. - ID: + ID: 1470 ContactLists: Administrative Contact: Primary: From 7d620405db83c3ad0820a1d21918ef894806221d Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 9 Aug 2023 12:50:32 -0500 Subject: [PATCH 088/184] Add OSPool tags, slight update to service description --- topology/Penn State University/PSU RC/PSU-submit.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/topology/Penn State University/PSU RC/PSU-submit.yaml b/topology/Penn State University/PSU RC/PSU-submit.yaml index d9f4e44d8..3628a6fbd 100644 --- a/topology/Penn State University/PSU RC/PSU-submit.yaml +++ b/topology/Penn State University/PSU RC/PSU-submit.yaml @@ -35,4 +35,6 @@ Resources: # valid services are listed in topology/services.yaml with the format ": " Services: Submit Node: 109 - Description: An OSPool Access Point to submit Jobs to the PSU LIGO Site. + Description: An OSPool Access Point to submit jobs to the OSPool and PSU LIGO Site. + Tags: + - OSPool From 1f7e6c8724ed24c12d9cde6adde078dc5dcb1969 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 9 Aug 2023 12:55:31 -0500 Subject: [PATCH 089/184] Drop unnecessary service ID --- topology/Penn State University/PSU RC/PSU-submit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Penn State University/PSU RC/PSU-submit.yaml b/topology/Penn State University/PSU RC/PSU-submit.yaml index 3628a6fbd..2ce59137e 100644 --- a/topology/Penn State University/PSU RC/PSU-submit.yaml +++ b/topology/Penn State University/PSU RC/PSU-submit.yaml @@ -34,7 +34,7 @@ Resources: FQDN: submit01.hpc.psu.edu # valid services are listed in topology/services.yaml with the format ": " Services: - Submit Node: 109 + Submit Node: Description: An OSPool Access Point to submit jobs to the OSPool and PSU LIGO Site. Tags: - OSPool From dcba46a6cf0d4dbb18111cf4b46dcead649eb91c Mon Sep 17 00:00:00 2001 From: edubach <124012043+edubach@users.noreply.github.com> Date: Wed, 9 Aug 2023 19:42:49 +0100 Subject: [PATCH 090/184] Create NET2.yaml This is the first resourcegroup yaml file for the NET2 project. --- .../NET2/NET2.yaml | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 topology/University of Massachusetts - Amherst/NET2/NET2.yaml diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml new file mode 100644 index 000000000..931608fbb --- /dev/null +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -0,0 +1,83 @@ +GroupDescription: Placeholder for NET2 +GroupID: 1365 +Production: true +SupportCenter: USATLAS +Resources: + NET2_SE_WebDAV: + Active: false + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000284 + Name: Eduardo Bach + Secondary: + ID: OSG1000443 + Name: William Leight + Security Contact: + Primary: + ID: OSG1000284 + Name: Eduardo Bach + Secondary: + ID: OSG1000443 + Name: William Leight + Description: HTTP-TPC WebDAV service for NET2 + FQDN: webdav.data.net2.mghpcc.org + ID: 1471 + Services: + WebDAV: + Description: HTTP-TPC WebDAV service + Details: + hidden: false + VOOwnership: + ATLAS: 100 + WLCGInformation: + APELNormalFactor: 0 + AccountingName: US-NET2 + HEPSPEC: 0 + InteropAccounting: true + InteropBDII: true + InteropMonitoring: true + KSI2KMax: 0 + KSI2KMin: 0 + StorageCapacityMax: 2000 + StorageCapacityMin: 2000 + TapeCapacity: 0 + NET2_SE_XRootD: + Active: false + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000284 + Name: Eduardo Bach + Secondary: + ID: OSG1000443 + Name: William Leight + Security Contact: + Primary: + ID: OSG1000284 + Name: Eduardo Bach + Secondary: + ID: OSG1000443 + Name: William Leight + Description: XRootD door for NET2 + FQDN: xrootd.data.net2.mghpcc.org + ID: 1472 + Services: + XRootD component: + Description: XRootD door + Details: + hidden: false + VOOwnership: + ATLAS: 100 + WLCGInformation: + APELNormalFactor: 0 + AccountingName: US-NET2 + HEPSPEC: 0 + InteropAccounting: true + InteropBDII: true + InteropMonitoring: true + KSI2KMax: 0 + KSI2KMin: 0 + StorageCapacityMax: 2000 + StorageCapacityMin: 2000 + TapeCapacity: 0 From 9503c058c88dd6ee23cc5240eb50a4f588e2228a Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 9 Aug 2023 13:49:53 -0500 Subject: [PATCH 091/184] Mark PSU AP as active (FD#73875) --- topology/Penn State University/PSU RC/PSU-submit.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Penn State University/PSU RC/PSU-submit.yaml b/topology/Penn State University/PSU RC/PSU-submit.yaml index 2ce59137e..2e59fb30a 100644 --- a/topology/Penn State University/PSU RC/PSU-submit.yaml +++ b/topology/Penn State University/PSU RC/PSU-submit.yaml @@ -5,7 +5,7 @@ GroupID: 1364 Resources: PSU-Submit01: - Active: false + Active: true Description: This is an OSPool Access Point for PSU RC. ID: 1470 ContactLists: From d136d0393ec9059a8033af610912a7271b1cf352 Mon Sep 17 00:00:00 2001 From: edubach <124012043+edubach@users.noreply.github.com> Date: Wed, 9 Aug 2023 20:49:25 +0100 Subject: [PATCH 092/184] Update NET2.yaml Changing Active false -> true --- topology/University of Massachusetts - Amherst/NET2/NET2.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml index 931608fbb..48c1979ce 100644 --- a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -4,7 +4,7 @@ Production: true SupportCenter: USATLAS Resources: NET2_SE_WebDAV: - Active: false + Active: true ContactLists: Administrative Contact: Primary: @@ -43,7 +43,7 @@ Resources: StorageCapacityMin: 2000 TapeCapacity: 0 NET2_SE_XRootD: - Active: false + Active: true ContactLists: Administrative Contact: Primary: From f37aea68b0f4b14070638fd18d4cd56f77d36639 Mon Sep 17 00:00:00 2001 From: Jadir Marra da Silva Date: Wed, 9 Aug 2023 18:53:30 -0300 Subject: [PATCH 093/184] Update SPRACE_downtime.yaml --- .../SPRACE/SPRACE_downtime.yaml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml index 731dd34be..6dd7f85f0 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE_downtime.yaml @@ -2499,3 +2499,69 @@ Services: - Squid # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179622 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: BR-Sprace BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179623 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: BR-Sprace LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179624 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: SPRACE + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179625 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: SPRACE-SE + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179626 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: T2_BR_SPRACE-squid1 + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1566179627 + Description: network outage - fiber cut + Severity: Outage + StartTime: Aug 09, 2023 21:00 +0000 + EndTime: Aug 10, 2023 01:00 +0000 + CreatedTime: Aug 09, 2023 21:52 +0000 + ResourceName: T2_BR_SPRACE-squid2 + Services: + - Squid +# --------------------------------------------------------- From aa1f585d3f83fa17ec3e8db96b188d95d1b4e02a Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 9 Aug 2023 16:59:40 -0500 Subject: [PATCH 094/184] Deactivate BU ATLAS T2 --- .../BU_ATLAS_Tier2.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml b/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml index b09d47f0e..eac069907 100644 --- a/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml +++ b/topology/Boston University/Boston University ATLAS Tier2/BU_ATLAS_Tier2.yaml @@ -3,7 +3,7 @@ GroupID: 8 Production: true Resources: NET2: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -48,7 +48,7 @@ Resources: StorageCapacityMin: 2300 TapeCapacity: 0 NET2v6: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -93,7 +93,7 @@ Resources: StorageCapacityMin: 2300 TapeCapacity: 0 net2.bu.edu-squid: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -118,7 +118,7 @@ Resources: VOOwnership: ATLAS: 100 perfSONAR-NET2-bw: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -145,7 +145,7 @@ Resources: VOOwnership: ATLAS: 100 perfSONAR-NET2-lat: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -172,7 +172,7 @@ Resources: VOOwnership: ATLAS: 100 perfSONAR_BU: - Active: true + Active: false ContactLists: Administrative Contact: Primary: @@ -199,7 +199,7 @@ Resources: VOOwnership: ATLAS: 100 SQUID_SLATE_BU: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From d6bcc56474de6174beef89bef15e1870b06a49a6 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Thu, 10 Aug 2023 10:57:32 -0500 Subject: [PATCH 095/184] Rename MOLLER.yaml to virtual-organizations/MOLLER.yaml Move to virtual-organizations subdirectory --- MOLLER.yaml => virtual-organizations/MOLLER.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename MOLLER.yaml => virtual-organizations/MOLLER.yaml (100%) diff --git a/MOLLER.yaml b/virtual-organizations/MOLLER.yaml similarity index 100% rename from MOLLER.yaml rename to virtual-organizations/MOLLER.yaml From 26367d4212ac2f04f30e39b70e9751fc4c1e2cf6 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 10 Aug 2023 09:49:31 -0700 Subject: [PATCH 096/184] Adding a OSDF cache in Brazil Adding a OSDF cache in Brazil --- .../SPRACE/SPRACE.yaml | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml index 96d999cf6..e06854145 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml @@ -1,7 +1,37 @@ -GroupDescription: (No resource group description) +GroupDescription: SPRACE Resources GroupID: 99 Production: true Resources: + + SPRACE_OSDF_ORIGIN: + Active: true + Description: SPRACE OSDF cache + ID: 1470 + ContactLists: + ContactLists: + Administrative Contact: + Primary: + ID: 5e7717a6ad4154d0a8a3b3232080615e8c9e4351 + Name: Marcio Antonio Costa + Secondary: + ID: 2f652c47255fc4d6b45f19667be57b8517ea006f + Name: Jadir Marra da Silva + Security Contact: + Primary: + ID: 5e7717a6ad4154d0a8a3b3232080615e8c9e4351 + Name: Marcio Antonio Costa + Secondary: + ID: 2f652c47255fc4d6b45f19667be57b8517ea006f + Name: Jadir Marra da Silva + + FQDN: osdf-cache.sprace.org.br + DN: /C=BR/O=ANSP/OU=ANSPGrid CA/OU=Services/CN=osdf-cache.sprace.org.br + Services: + XRootD cache server: + Description: SPRACE OSDF cache + AllowedVOs: + - ANY + BR-Sprace BW: Active: true ContactLists: From 7cfa6bf95beff7ffeb109395c0a8e6ca9b2261ed Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 10 Aug 2023 10:01:30 -0700 Subject: [PATCH 097/184] Update SPRACE.yaml --- topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml index e06854145..465c7b4f3 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml @@ -3,12 +3,11 @@ GroupID: 99 Production: true Resources: - SPRACE_OSDF_ORIGIN: + SPRACE_OSDF_CACHE: Active: true Description: SPRACE OSDF cache ID: 1470 ContactLists: - ContactLists: Administrative Contact: Primary: ID: 5e7717a6ad4154d0a8a3b3232080615e8c9e4351 @@ -23,7 +22,6 @@ Resources: Secondary: ID: 2f652c47255fc4d6b45f19667be57b8517ea006f Name: Jadir Marra da Silva - FQDN: osdf-cache.sprace.org.br DN: /C=BR/O=ANSP/OU=ANSPGrid CA/OU=Services/CN=osdf-cache.sprace.org.br Services: From 818141be3336f67568d39b9b8b203ba9b52a840d Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 10 Aug 2023 10:03:14 -0700 Subject: [PATCH 098/184] Adding SPRACE_OSDF_CACHE Adding SPRACE_OSDF_CACHE to LIGO --- virtual-organizations/LIGO.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/virtual-organizations/LIGO.yaml b/virtual-organizations/LIGO.yaml index b3e0f830d..49bd8fb72 100644 --- a/virtual-organizations/LIGO.yaml +++ b/virtual-organizations/LIGO.yaml @@ -121,6 +121,7 @@ DataFederations: - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE - SINGAPORE_INTERNET2_OSDF_CACHE + - SPRACE_OSDF_CACHE - Path: /igwn/virgo Authorizations: - FQAN: /osg/ligo @@ -167,6 +168,7 @@ DataFederations: - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE - SINGAPORE_INTERNET2_OSDF_CACHE + - SPRACE_OSDF_CACHE - Path: /igwn/ligo Authorizations: - FQAN: /osg/ligo @@ -213,6 +215,7 @@ DataFederations: - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE - SINGAPORE_INTERNET2_OSDF_CACHE + - SPRACE_OSDF_CACHE - Path: /igwn/shared Authorizations: - FQAN: /osg/ligo @@ -259,6 +262,7 @@ DataFederations: - HOUSTON2_INTERNET2_OSDF_CACHE - CIT_LIGO_STASHCACHE - SINGAPORE_INTERNET2_OSDF_CACHE + - SPRACE_OSDF_CACHE - Path: /gwdata Authorizations: - PUBLIC From 3ab4501923f2572ffd95473974f53bded4743fe8 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 10 Aug 2023 10:07:12 -0700 Subject: [PATCH 099/184] fixing ID fixing resource ID --- topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml index 465c7b4f3..076dcb73d 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml @@ -1,12 +1,11 @@ GroupDescription: SPRACE Resources GroupID: 99 Production: true -Resources: - +Resources: SPRACE_OSDF_CACHE: Active: true Description: SPRACE OSDF cache - ID: 1470 + ID: 1366 ContactLists: Administrative Contact: Primary: From 537d7894864c9550346669ef5761b22a3c110a7f Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 10 Aug 2023 10:12:13 -0700 Subject: [PATCH 100/184] Fixing ID Fixing resource ID --- topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml index 076dcb73d..feb58c25c 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml @@ -5,7 +5,7 @@ Resources: SPRACE_OSDF_CACHE: Active: true Description: SPRACE OSDF cache - ID: 1366 + ID: 1473 ContactLists: Administrative Contact: Primary: From 5d5a3db901a9734985bb4c1626bdbf592bd8995c Mon Sep 17 00:00:00 2001 From: Amitesh Singh <39181157+Amiteshh@users.noreply.github.com> Date: Fri, 11 Aug 2023 16:40:10 -0500 Subject: [PATCH 101/184] Add Project UMiss_Gupta --- projects/UMiss_Gupta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 projects/UMiss_Gupta.yaml diff --git a/projects/UMiss_Gupta.yaml b/projects/UMiss_Gupta.yaml new file mode 100644 index 000000000..c7986c9ca --- /dev/null +++ b/projects/UMiss_Gupta.yaml @@ -0,0 +1,6 @@ +Department: LIGO +Description: 'We are studying the evolution of binary black holes and it would be + great to try out the OS Pool facility through the AP40 cluster. ' +FieldOfScience: Astronomy and Astrophysics +Organization: University of Mississippi +PIName: Anuradha Gupta From dc8f9da35ee71f633f04159d81353dc2eb710c11 Mon Sep 17 00:00:00 2001 From: Kenichi Hatakeyama Date: Mon, 14 Aug 2023 07:08:40 -0500 Subject: [PATCH 102/184] Update Baylor-Kodiak_downtime.yaml --- .../Baylor University/Baylor-Kodiak_downtime.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml b/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml index a64003da4..9b9d5271a 100644 --- a/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml +++ b/topology/Baylor University/Baylor University/Baylor-Kodiak_downtime.yaml @@ -42,3 +42,15 @@ Services: - CE # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1570148706 + Description: Maintenance + Severity: Outage + StartTime: Aug 14, 2023 14:00 +0000 + EndTime: Aug 19, 2023 04:00 +0000 + CreatedTime: Aug 14, 2023 12:07 +0000 + ResourceName: Baylor-Kodiak-CE + Services: + - CE + - Squid +# --------------------------------------------------------- From 6c039aa86767a53276f1e945aabad7e6f0e989b0 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:34:52 -0500 Subject: [PATCH 103/184] Create SIUE_Quinones.yaml --- projects/SIUE_Quinones.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/SIUE_Quinones.yaml diff --git a/projects/SIUE_Quinones.yaml b/projects/SIUE_Quinones.yaml new file mode 100644 index 000000000..3a9e25b04 --- /dev/null +++ b/projects/SIUE_Quinones.yaml @@ -0,0 +1,5 @@ +Description: Research in Computer Vision, Digital Image Processing, and Multi-Agent Simulation. +Department: Computer Science +FieldOfScience: Computer Science +Organization: Southern Illinois University Edwardsville +PIName: Rubi Quinones From f717f908aacc9088d4772c949dfd221c3be1dd2d Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:46:07 -0500 Subject: [PATCH 104/184] Create Webster_Suo.yaml --- projects/Webster_Suo.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 projects/Webster_Suo.yaml diff --git a/projects/Webster_Suo.yaml b/projects/Webster_Suo.yaml new file mode 100644 index 000000000..77067a177 --- /dev/null +++ b/projects/Webster_Suo.yaml @@ -0,0 +1,7 @@ +Description: >This work aims to construct a flexible scan system using multiple cameras + that can correctly reconstruct 3D objects -- a human face with expression. The work + proposed and used mathematical models to automate the 3D object reconstruction. +Department: Computer and information science +FieldOfScience: Computer Science +Organization: Webster University +PIName: Xiaoyuan Suo From a8692c2a62676e6693c82dbdf9eee8fe58f4f30f Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:51:41 -0500 Subject: [PATCH 105/184] Create UWMadison_Li.yaml --- projects/UWMadison_Li.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/UWMadison_Li.yaml diff --git a/projects/UWMadison_Li.yaml b/projects/UWMadison_Li.yaml new file mode 100644 index 000000000..beec8f9fa --- /dev/null +++ b/projects/UWMadison_Li.yaml @@ -0,0 +1,5 @@ +Description: Multiscale modeling, computational materials design, mechanics and physics of polymers, and machine learning-accelerated polymer design. +Department: Mechanical Engineering +FieldOfScience: Engineering +Organization: University of Wisconsin-Madison +PIName: Ying Li From 00e656401f57f548ad8c56c6685146b0d0200156 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:54:58 -0500 Subject: [PATCH 106/184] Create UWMadison_Weigel.yaml --- projects/UWMadison_Weigel.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/UWMadison_Weigel.yaml diff --git a/projects/UWMadison_Weigel.yaml b/projects/UWMadison_Weigel.yaml new file mode 100644 index 000000000..b42f69513 --- /dev/null +++ b/projects/UWMadison_Weigel.yaml @@ -0,0 +1,5 @@ +Description: Animal breeding and Genomics +Department: Animal and Dairy Sciences +FieldOfScience: Genomics +Organization: University of Wisconsin-Madison +PIName: Kent Weigel From 98862668d18704884b871067f53df17167136ae0 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Mon, 14 Aug 2023 11:59:50 -0500 Subject: [PATCH 107/184] Fix formatting --- projects/Webster_Suo.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/Webster_Suo.yaml b/projects/Webster_Suo.yaml index 77067a177..be3700428 100644 --- a/projects/Webster_Suo.yaml +++ b/projects/Webster_Suo.yaml @@ -1,4 +1,5 @@ -Description: >This work aims to construct a flexible scan system using multiple cameras +Description: > + This work aims to construct a flexible scan system using multiple cameras that can correctly reconstruct 3D objects -- a human face with expression. The work proposed and used mathematical models to automate the 3D object reconstruction. Department: Computer and information science From 2672c83f111ccca9dc8889fb6bd7da26664affdf Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 14 Aug 2023 13:39:28 -0700 Subject: [PATCH 108/184] Fixing indentation Fixing indentation --- topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml index feb58c25c..b68c401c9 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SPRACE.yaml @@ -14,7 +14,7 @@ Resources: Secondary: ID: 2f652c47255fc4d6b45f19667be57b8517ea006f Name: Jadir Marra da Silva - Security Contact: + Security Contact: Primary: ID: 5e7717a6ad4154d0a8a3b3232080615e8c9e4351 Name: Marcio Antonio Costa From 6042d91b3f339f1f34162b6fee9c7f731ebabc26 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Mon, 14 Aug 2023 14:17:51 -0700 Subject: [PATCH 109/184] Update UCSD.yaml --- virtual-organizations/UCSD.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/virtual-organizations/UCSD.yaml b/virtual-organizations/UCSD.yaml index 13f25c533..cb650396f 100644 --- a/virtual-organizations/UCSD.yaml +++ b/virtual-organizations/UCSD.yaml @@ -24,15 +24,13 @@ FieldsOfScience: - Multi-Science Community ID: 234 LongName: UCSD multiple sciences origin - - DataFederations: StashCache: Namespaces: - Path: /ucsd Authorizations: - SciTokens: - Issuer: https://token.nationalresearchplatform.org/ucsd + Issuer: https://token.nationalresearchplatform.org/ucsdphysics Base Path: /ucsd/physics Map Subject: False - PUBLIC @@ -40,3 +38,4 @@ DataFederations: - SDSC_NRP_OSDF_ORIGIN AllowedCaches: - ANY + From 6c7dfe5c5325f5958ab78bdc7526bd638b741658 Mon Sep 17 00:00:00 2001 From: wleight <130098733+wleight@users.noreply.github.com> Date: Tue, 15 Aug 2023 10:33:39 -0400 Subject: [PATCH 110/184] Add NET2 PS instances --- .../NET2/NET2.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml index 48c1979ce..5e8113828 100644 --- a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -81,3 +81,57 @@ Resources: StorageCapacityMax: 2000 StorageCapacityMin: 2000 TapeCapacity: 0 + NET2-PS-BW: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000443 + Name: William Leight + Secondary: + ID: OSG1000284 + Name: Eduardo Bach + Security Contact: + Primary: + ID: OSG1000443 + Name: William Leight + Secondary: + ID: OSG1000284 + Name: Eduardo Bach + Description: This is the perfSONAR-PS bandwidth instance at the NET2 site. + FQDN: argus1.net2.mghpcc.org + ID: 1474 + Services: + net.perfSONAR.Bandwidth: + Description: PerfSonar Bandwidth monitoring node + Details: + endpoint: argus1.net2.mghpcc.org + VOOwnership: + ATLAS: 100 + NET2-PS-LAT: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000443 + Name: William Leight + Secondary: + ID: OSG1000284 + Name: Eduardo Bach + Security Contact: + Primary: + ID: OSG1000443 + Name: William Leight + Secondary: + ID: OSG1000284 + Name: Eduardo Bach + Description: This is the perfSONAR-PS latency instance at the NET2 site. + FQDN: argus2.net2.mghpcc.org + ID: 1475 + Services: + net.perfSONAR.Latency: + Description: PerfSonar Latency monitoring node + Details: + endpoint: argus2.net2.mghpcc.org + VOOwnership: + ATLAS: 100 From 565576213cc63fa1f9bc24293aef3d5984b9df57 Mon Sep 17 00:00:00 2001 From: Sean Dobbs Date: Tue, 15 Aug 2023 12:07:27 -0400 Subject: [PATCH 111/184] Update OSG_US_FSU_HNPGRID.yaml Adding new OSDF origin server for FSU-HNPGRID --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index d83d34ecb..c50d10c85 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -52,4 +52,29 @@ Resources: hidden: false VOOwnership: Gluex: 100 + FSU-HNPGRID-OSDF-Origin: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd + Name: Sean Dobbs + Security Contact: + Primary: + ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd + Name: Sean Dobbs + Site Contact: + Primary: + ID: 73ed2d273dace60d6e6ff5baabeb8755624001bd + Name: Sean Dobbs + Description: OSDF Origin server for FSU-HNPGRID + FQDN: npgrid.fsu.edu + ID: + Services: + XRootD origin server: + Description: OSDF Origin server for FSU-HNPGRID + Details: + hidden: false + VOOwnership: + Gluex: 100 SupportCenter: UChicago From 7c819faac4ee83ef255949fe29db18e9c2cc0fd8 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:15:16 -0500 Subject: [PATCH 112/184] Create UTEP_Moore.yaml --- projects/UTEP_Moore.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/UTEP_Moore.yaml diff --git a/projects/UTEP_Moore.yaml b/projects/UTEP_Moore.yaml new file mode 100644 index 000000000..7de2f2430 --- /dev/null +++ b/projects/UTEP_Moore.yaml @@ -0,0 +1,5 @@ +Description: We are developing portable containers for deep-learning frameworks and applications +Department: Computer Science +FieldOfScience: Computer and Information Services +Organization: University of Texas at El Paso +PIName: Shirley Moore From 663172905c7df62ae1b47fe0d1d17695c9fd3d72 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:37:32 -0500 Subject: [PATCH 113/184] Create BNL_Venugopalan.yaml --- projects/BNL_Venugopalan.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 projects/BNL_Venugopalan.yaml diff --git a/projects/BNL_Venugopalan.yaml b/projects/BNL_Venugopalan.yaml new file mode 100644 index 000000000..9c33a9438 --- /dev/null +++ b/projects/BNL_Venugopalan.yaml @@ -0,0 +1,6 @@ +Description: >We investigate the dynamics of strongly interacting field theories through a variety of numerical methods, + ranging from classical lattice simulations to tensor network projects. +Department: Physics +FieldOfScience: Physics +Organization: Brookhaven National Laboratory +PIName: Raju Venugopalan From 53fb24b47cbe211823ff76e26998c17fd653af54 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:46:37 -0500 Subject: [PATCH 114/184] Update BNL_Venugopalan.yaml --- projects/BNL_Venugopalan.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/BNL_Venugopalan.yaml b/projects/BNL_Venugopalan.yaml index 9c33a9438..d9e13ab14 100644 --- a/projects/BNL_Venugopalan.yaml +++ b/projects/BNL_Venugopalan.yaml @@ -1,4 +1,5 @@ -Description: >We investigate the dynamics of strongly interacting field theories through a variety of numerical methods, +Description: > + We investigate the dynamics of strongly interacting field theories through a variety of numerical methods, ranging from classical lattice simulations to tensor network projects. Department: Physics FieldOfScience: Physics From 78db2e1bc624e7bc0afeb3294d063fea22d41019 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 13:28:59 -0500 Subject: [PATCH 115/184] Create CSUN_Jiang.yaml --- projects/CSUN_Jiang.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/CSUN_Jiang.yaml diff --git a/projects/CSUN_Jiang.yaml b/projects/CSUN_Jiang.yaml new file mode 100644 index 000000000..f711c38f5 --- /dev/null +++ b/projects/CSUN_Jiang.yaml @@ -0,0 +1,9 @@ +Description: > + Wildfire Prediction for California using various remote sensing data from the past decades. + This is a computation intensive research project that involves applying machine learning models for data analysis and prediction, + and also computation-intensive work for data visualization. + This project will involve collaborations from both internal and external students at California State University, Northridge. +Department: Computer Science +FieldOfScience: Computer and Information Sciences +Organization: California State University Northridge +PIName: Xunfei Jiang From be0ba4c8d23ac1b2be8af30015a561965a8225a6 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Tue, 15 Aug 2023 13:38:35 -0500 Subject: [PATCH 116/184] Use existing name for California State University --- projects/CSUN_Jiang.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/CSUN_Jiang.yaml b/projects/CSUN_Jiang.yaml index f711c38f5..b32d7f39b 100644 --- a/projects/CSUN_Jiang.yaml +++ b/projects/CSUN_Jiang.yaml @@ -5,5 +5,5 @@ Description: > This project will involve collaborations from both internal and external students at California State University, Northridge. Department: Computer Science FieldOfScience: Computer and Information Sciences -Organization: California State University Northridge +Organization: California State University, Northridge PIName: Xunfei Jiang From 4d826e75c624a7d7c5437785a9fa62e1882b3326 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Tue, 15 Aug 2023 14:12:56 -0500 Subject: [PATCH 117/184] Fix indentation for NET2-PS-LAT --- topology/University of Massachusetts - Amherst/NET2/NET2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml index 5e8113828..77fbeda4b 100644 --- a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -108,7 +108,7 @@ Resources: endpoint: argus1.net2.mghpcc.org VOOwnership: ATLAS: 100 - NET2-PS-LAT: + NET2-PS-LAT: Active: true ContactLists: Administrative Contact: From 4f305a0b65498d9f47a10db36b7fa6c90575eddb Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:25:52 -0500 Subject: [PATCH 118/184] Create BrighamAndWomens_ Baratono.yaml --- projects/BrighamAndWomens_ Baratono.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/BrighamAndWomens_ Baratono.yaml diff --git a/projects/BrighamAndWomens_ Baratono.yaml b/projects/BrighamAndWomens_ Baratono.yaml new file mode 100644 index 000000000..c52d5c1b0 --- /dev/null +++ b/projects/BrighamAndWomens_ Baratono.yaml @@ -0,0 +1,5 @@ +Description: Studying how atrophy and connectivity to atrophy impacts cognitive and psychological outcomes in patients with a variety of neurodegenerative disorders +Department: Neurology +FieldOfScience: Biological and Biomedical Sciences +Organization: Brigham and Women's Hospital +PIName: Sheena R Baratono From 1ac6c263960a4ca4200cc5e93dfe98727f8a0376 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:19:10 -0500 Subject: [PATCH 119/184] Create UWMadison_Solis-Lemus.yaml --- projects/UWMadison_Solis-Lemus.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 projects/UWMadison_Solis-Lemus.yaml diff --git a/projects/UWMadison_Solis-Lemus.yaml b/projects/UWMadison_Solis-Lemus.yaml new file mode 100644 index 000000000..f237cc4c9 --- /dev/null +++ b/projects/UWMadison_Solis-Lemus.yaml @@ -0,0 +1,7 @@ +Description: > + Using machine learning methods to identify sounds from audio recordings + in multiple regions of the world through time. +Department: Plant Pathology +FieldOfScience: Biological Sciences +Organization: University of Wisconsin-Madison +PIName: Claudia Solis-Lemus From 8d1cb572c845fe5b58b313958384eb45655981f0 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:51:26 -0500 Subject: [PATCH 120/184] Create CSU_Buchanan.yaml --- projects/CSU_Buchanan.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/CSU_Buchanan.yaml diff --git a/projects/CSU_Buchanan.yaml b/projects/CSU_Buchanan.yaml new file mode 100644 index 000000000..2e321d038 --- /dev/null +++ b/projects/CSU_Buchanan.yaml @@ -0,0 +1,5 @@ +Description: Modeling of magnetorheological elastomers +Department: Physics +FieldOfScience: Physics +Organization: Colorado State University +PIName: Kristen Buchanan From 49c278b464657c5ca5ae9b481e50514b92fc0285 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 16 Aug 2023 09:02:23 -0500 Subject: [PATCH 121/184] Create UNL_Hebets.yaml --- projects/UNL_Hebets.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/UNL_Hebets.yaml diff --git a/projects/UNL_Hebets.yaml b/projects/UNL_Hebets.yaml new file mode 100644 index 000000000..6bd82256c --- /dev/null +++ b/projects/UNL_Hebets.yaml @@ -0,0 +1,5 @@ +Description: Assess spider web structure by training and tracking models using SLEAP +Department: Biological Sciences +FieldOfScience: Biological Sciences +Organization: University of Nebraska-Lincoln +PIName: Eileen Hebets From f3523330fc499a724613c63795b73d9040b27f85 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 17 Aug 2023 10:56:02 -0500 Subject: [PATCH 122/184] Adds uci-gpatlas-ce1 entry --- topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml index 624adbd7e..6085b7ddc 100644 --- a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml +++ b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml @@ -26,3 +26,26 @@ Resources: Description: Compute Element Details: hidden: false + UCI-GPATLAS-CE1: + Active: true + ContactLists: + Administrative Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Security Contact: + Primary: + ID: bc36e7fe84fffcb5cf195fe09cc42336f5cd5d1f + Name: Diego Davila + Site Contact: + Primary: + ID: dbcd20edf55fb43c78b2e547a393898b42643d29 + Name: Nathan Crawford + Description: SLATE deployed Hosted CE for the GPAtlas Cluster + FQDN: uci-gpatlas-ce1.svc.opensciencegrid.org + ID: 1476 + Services: + CE: + Description: Compute Element + Details: + hidden: false \ No newline at end of file From b3991e63585c7df160d59e2a44cafd131772fcea Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Thu, 17 Aug 2023 10:56:29 -0500 Subject: [PATCH 123/184] Create NCSU_Staff.yaml --- projects/NCSU_Staff.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 projects/NCSU_Staff.yaml diff --git a/projects/NCSU_Staff.yaml b/projects/NCSU_Staff.yaml new file mode 100644 index 000000000..f2b62a42c --- /dev/null +++ b/projects/NCSU_Staff.yaml @@ -0,0 +1,7 @@ +Description: > + Continue my access to the OSPool after the OSG School to further + support potential users and workflows for NC State University +Department: Research Facilitation Service +FieldOfScience: Other +Organization: North Carolina State University +PIName: Christopher Blanton From 44f433bf1224355b33ebb99ff3e01d956f4adc62 Mon Sep 17 00:00:00 2001 From: Rachel Lombardi <37351287+rachellombardi@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:15:02 -0500 Subject: [PATCH 124/184] Create Etown_Wittmeyer.yaml --- projects/Etown_Wittmeyer.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 projects/Etown_Wittmeyer.yaml diff --git a/projects/Etown_Wittmeyer.yaml b/projects/Etown_Wittmeyer.yaml new file mode 100644 index 000000000..8f19a77fa --- /dev/null +++ b/projects/Etown_Wittmeyer.yaml @@ -0,0 +1,11 @@ +Description: I am interested in examining experience-dependent neuroplasticity and individual differences in humans as it pertains to learning and memory. In particular, I analyze structural magnetic resonance imaging (sMRI) data from various neuroimaging data-sharing platforms to explore changes in gray matter across learning and/or correlate learning performance with various cognitive and demographic factors. +Department: Psychology +FieldOfScience: Psychology and Life Sciences +Organization: Elizabethtown College +PIName: Jennifer Legault Wittmeyer + +ID: '591' + +Sponsor: + CampusGrid: + Name: OSG Connect From 50c6d86d76fd499e750bb7fa4f4221afb9b23f38 Mon Sep 17 00:00:00 2001 From: Rachel Lombardi <37351287+rachellombardi@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:34:23 -0500 Subject: [PATCH 125/184] Create IIT_Zhong.yaml --- projects/IIT_Zhong.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/IIT_Zhong.yaml diff --git a/projects/IIT_Zhong.yaml b/projects/IIT_Zhong.yaml new file mode 100644 index 000000000..69fb8928d --- /dev/null +++ b/projects/IIT_Zhong.yaml @@ -0,0 +1,9 @@ +Description: We conduct research on scientific machine learning, especially related to how machine learning can be used to learn and understand dynamical systems from observation data. Right now, we are developing models to understand synchronization, i.e. how oscillators can be put in sync with spatial patterns. +Department: Appleid Mathematics +FieldOfScience: Appleid Mathematics +Organization: Illinois Institute of Technology +PIName: Ming Zhong + +Sponsor: + CampusGrid: + Name: OSG Connect From af68cc6b4c2c2c7e5dd0210dd7492d1f0f85b350 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 17 Aug 2023 13:44:06 -0500 Subject: [PATCH 126/184] auto-generate IDs for facilities, sites, resources, and resource groups based on name --- src/webapp/common.py | 10 ++++++++-- src/webapp/rg_reader.py | 8 ++++---- src/webapp/topology.py | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/webapp/common.py b/src/webapp/common.py index 8e0ed8957..8e0d80bb9 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -222,7 +222,6 @@ def trim_space(s: str) -> str: ret = re.sub(r"(?m)^[ \t]+", "", ret) return ret - def run_git_cmd(cmd: List, dir=None, git_dir=None, ssh_key=None) -> bool: """ Run git command, optionally specifying ssh key and/or git dirs @@ -287,7 +286,14 @@ def git_clone_or_fetch_mirror(repo, git_dir, ssh_key=None) -> bool: return ok -def gen_id(instr: AnyStr, digits, minimum=1, hashfn=hashlib.md5) -> int: +def gen_id_from_yaml(data: dict, alternate_name: AnyStr, id_key = "ID", digits = 16, minimum = 1, hashfn=hashlib.md5) -> int: + return data.get(id_key, gen_id(alternate_name, digits, minimum, hashfn)) + +def gen_id(instr: AnyStr, digits = 16, minimum=1, hashfn=hashlib.md5) -> int: + """ + Convert a string to its integer md5sum, used to autogenerate unique IDs for entities where + not otherwise specified + """ instr_b = instr if isinstance(instr, bytes) else instr.encode("utf-8", "surrogateescape") mod = (10 ** digits) - minimum return minimum + (int(hashfn(instr_b).hexdigest(), 16) % mod) diff --git a/src/webapp/rg_reader.py b/src/webapp/rg_reader.py index 4e8182b4d..ba5f0f6b6 100755 --- a/src/webapp/rg_reader.py +++ b/src/webapp/rg_reader.py @@ -18,12 +18,11 @@ from pathlib import Path import yaml - # thanks stackoverflow if __name__ == "__main__" and __package__ is None: sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from webapp.common import ensure_list, to_xml, Filters, load_yaml_file +from webapp.common import ensure_list, to_xml, Filters, load_yaml_file, gen_id_from_yaml from webapp.contacts_reader import get_contacts_data from webapp.topology import CommonData, Topology @@ -72,7 +71,8 @@ def get_topology(indir="../topology", contacts_data=None, strict=False): for facility_path in root.glob("*/FACILITY.yaml"): name = facility_path.parts[-2] - id_ = load_yaml_file(facility_path)["ID"] + facility_data = load_yaml_file(facility_path) + id_ = gen_id_from_yaml(facility_data if facility_data else {}, name) topology.add_facility(name, id_) for site_path in root.glob("*/*/SITE.yaml"): facility, name = site_path.parts[-3:-1] @@ -85,7 +85,7 @@ def get_topology(indir="../topology", contacts_data=None, strict=False): log.error(skip_msg) continue site_info = load_yaml_file(site_path) - id_ = site_info["ID"] + id_ = gen_id_from_yaml(site_info, name) topology.add_site(facility, name, id_, site_info) for yaml_path in root.glob("*/*/*.yaml"): facility, site, name = yaml_path.parts[-3:] diff --git a/src/webapp/topology.py b/src/webapp/topology.py index dee616829..79037bae7 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -8,7 +8,7 @@ import icalendar from .common import RGDOWNTIME_SCHEMA_URL, RGSUMMARY_SCHEMA_URL, Filters, ParsedYaml,\ - is_null, expand_attr_list_single, expand_attr_list, ensure_list, XROOTD_ORIGIN_SERVER, XROOTD_CACHE_SERVER + is_null, expand_attr_list_single, expand_attr_list, ensure_list, XROOTD_ORIGIN_SERVER, XROOTD_CACHE_SERVER, gen_id_from_yaml from .contacts_reader import ContactsData, User from .exceptions import DataError @@ -115,7 +115,7 @@ def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData): if is_null(yaml_data, "FQDN"): raise ValueError(f"Resource {name} does not have an FQDN") self.fqdn = self.data["FQDN"] - self.id = self.data["ID"] + self.id = gen_id_from_yaml(self.data, self.name) def get_stashcache_files(self, global_data, legacy): """Gets a resources Cache files as a dictionary""" @@ -420,7 +420,7 @@ def get_tree(self, authorized=False, filters: Filters = None) -> Optional[Ordere @property def id(self): - return self.data["GroupID"] + return gen_id_from_yaml(self.data, self.name, "GroupID") @property def key(self): From 3d5b114077ca8fe15871437625c0905a17456cd6 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 17 Aug 2023 15:11:57 -0500 Subject: [PATCH 127/184] auto generate ids for projects based on name --- src/webapp/project_reader.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/webapp/project_reader.py b/src/webapp/project_reader.py index e50399c76..10468ea60 100755 --- a/src/webapp/project_reader.py +++ b/src/webapp/project_reader.py @@ -13,7 +13,7 @@ if __name__ == "__main__" and __package__ is None: sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from webapp.common import load_yaml_file, to_xml, is_null +from webapp.common import load_yaml_file, to_xml, is_null, gen_id_from_yaml from webapp.vo_reader import get_vos_data from webapp.vos_data import VOsData @@ -64,9 +64,6 @@ def get_one_project(file: str, campus_grid_ids: Dict, vos_data: VOsData) -> Dict if 'ResourceAllocations' in data: resource_allocations = [get_resource_allocation(ra, idx) for idx, ra in enumerate(data['ResourceAllocations'])] data['ResourceAllocations'] = {"ResourceAllocation": resource_allocations} - if 'ID' not in data: - del project['ID'] - name_from_filename = os.path.basename(file)[:-5] # strip '.yaml' if not is_null(data, 'Name'): if data['Name'] != name_from_filename: @@ -74,6 +71,9 @@ def get_one_project(file: str, campus_grid_ids: Dict, vos_data: VOsData) -> Dict else: data['Name'] = name_from_filename + data['ID'] = str(gen_id_from_yaml(data, data['Name'])) + + except Exception as e: log.error("%r adding project %s", e, file) log.error("Data:\n%s", pprint.pformat(data)) From c896c898e178220376bf2078c6cd7c162bb7958b Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 17 Aug 2023 15:22:17 -0500 Subject: [PATCH 128/184] auto generate ids for VOs based on name --- src/webapp/vos_data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/webapp/vos_data.py b/src/webapp/vos_data.py index 2804eeb76..ed077d670 100644 --- a/src/webapp/vos_data.py +++ b/src/webapp/vos_data.py @@ -4,7 +4,7 @@ from logging import getLogger from typing import Dict, List, Optional -from .common import Filters, ParsedYaml, VOSUMMARY_SCHEMA_URL, is_null, expand_attr_list, order_dict, escape +from .common import Filters, ParsedYaml, VOSUMMARY_SCHEMA_URL, is_null, expand_attr_list, order_dict, escape, gen_id_from_yaml from .data_federation import StashCache from .contacts_reader import ContactsData @@ -23,6 +23,7 @@ def get_vo_id_to_name(self) -> Dict[str, str]: return {self.vos[name]["ID"]: name for name in self.vos} def add_vo(self, vo_name: str, vo_data: ParsedYaml): + vo_data["ID"] = gen_id_from_yaml(vo_data, vo_name) self.vos[vo_name] = vo_data stashcache_data = vo_data.get('DataFederations', {}).get('StashCache') if stashcache_data: @@ -133,6 +134,7 @@ def _expand_vo(self, name: str, authorized: bool, filters: Filters) -> Optional[ if not is_null(vo, "ParentVO"): parentvo = OrderedDict.fromkeys(["ID", "Name"]) parentvo.update(vo["ParentVO"]) + parentvo['ID'] = gen_id_from_yaml(parentvo, parentvo["Name"]) new_vo["ParentVO"] = parentvo if not is_null(vo, "Credentials"): From b34b6692531b5fb7f07868ef612902d55ebdd95b Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 17 Aug 2023 16:35:23 -0500 Subject: [PATCH 129/184] auto generate ids for support centers and service types based on name --- src/webapp/topology.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/webapp/topology.py b/src/webapp/topology.py index 79037bae7..0df0ca03e 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -34,6 +34,13 @@ def __init__(self, contacts: ContactsData, service_types: Dict, support_centers: self.service_types = service_types self.support_centers = support_centers + # Auto-generate IDs for any services and support centers that don't have them + for key, val in self.service_types.items(): + self.service_types[key] = val if val else gen_id_from_yaml({}, key) + + for key, val in self.support_centers.items(): + val['ID'] = gen_id_from_yaml(val, key) + class Facility(object): def __init__(self, name: str, id: int): @@ -461,9 +468,11 @@ class Downtime(object): def __init__(self, rg: ResourceGroup, yaml_data: ParsedYaml, common_data: CommonData): self.rg = rg self.data = yaml_data - for k in ["StartTime", "EndTime", "ID", "Class", "Severity", "ResourceName", "Services"]: + for k in ["StartTime", "EndTime", "Class", "Severity", "ResourceName", "Services"]: if is_null(yaml_data, k): raise ValueError(k) + # Downtimes aren't uniquely named, so hash an ID based on several ResourceName + StartTime + yaml_data['ID'] = gen_id_from_yaml(yaml_data, '{ResourceName}-{StartTime}'.format(**yaml_data)) self.start_time = self.parsetime(yaml_data["StartTime"]) self.end_time = self.parsetime(yaml_data["EndTime"]) self.created_time = None From 9c5b3f8b7741c098de96284e744af1b400955388 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 17 Aug 2023 17:32:58 -0500 Subject: [PATCH 130/184] update verify_resources tests to allow resources with null IDs --- src/tests/verify_resources.py | 13 ++++++++----- src/webapp/common.py | 8 ++++++-- src/webapp/topology.py | 4 +++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/tests/verify_resources.py b/src/tests/verify_resources.py index bc79dd70b..a7de19e74 100755 --- a/src/tests/verify_resources.py +++ b/src/tests/verify_resources.py @@ -369,27 +369,30 @@ def test_7_fqdn_unique(rgs, rgfns): def test_8_res_ids(rgs, rgfns): - # Check that resources/resource groups have a numeric ID/GroupID + # Check that resources/resource groups have a unique, numeric ID/GroupID + # in the case that an ID is manually assigned errors = 0 ridres = autodict() gidrgs = autodict() for rg,rgfn in zip(rgs,rgfns): - if not isinstance(rg.get('GroupID'), int): + group_id = rg.get('GroupID') + if group_id is not None and not isinstance(group_id, int): print_emsg_once('ResGrpID') print("ERROR: Resource Group missing numeric GroupID: '%s'" % rgfn) errors += 1 - else: + elif group_id: gidrgs[rg['GroupID']] += [rgfn] for resname,res in sorted(rg['Resources'].items()): - if not isinstance(res.get('ID'), int): + resource_id = res.get('ID') + if resource_id is not None and not isinstance(resource_id, int): print_emsg_once('ResID') print("ERROR: Resource '%s' missing numeric ID in '%s'" % (resname, rgfn)) errors += 1 - else: + elif resource_id: ridres[res['ID']] += [(rgfn, resname)] for gid,rglist in sorted(gidrgs.items()): diff --git a/src/webapp/common.py b/src/webapp/common.py index 8e0d80bb9..785d9868d 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -286,8 +286,12 @@ def git_clone_or_fetch_mirror(repo, git_dir, ssh_key=None) -> bool: return ok -def gen_id_from_yaml(data: dict, alternate_name: AnyStr, id_key = "ID", digits = 16, minimum = 1, hashfn=hashlib.md5) -> int: - return data.get(id_key, gen_id(alternate_name, digits, minimum, hashfn)) +def gen_id_from_yaml(data: dict, alternate_name: str, id_key = "ID", digits = 16, minimum = 1, hashfn=hashlib.md5) -> int: + """ + Given a yaml object, return its existing ID if an ID is present, or generate a new ID for the object + based on the md5sum of an alternate string value (usually the key of the object in its parent dictionary) + """ + return data.get(id_key) or gen_id(alternate_name, digits, minimum, hashfn) def gen_id(instr: AnyStr, digits = 16, minimum=1, hashfn=hashlib.md5) -> int: """ diff --git a/src/webapp/topology.py b/src/webapp/topology.py index 0df0ca03e..c81ef021c 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -119,10 +119,11 @@ def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData): self.services = [] self.service_names = [n["Name"] for n in self.services if "Name" in n] self.data = yaml_data + self.data['ID'] = gen_id_from_yaml(self.data, self.name) if is_null(yaml_data, "FQDN"): raise ValueError(f"Resource {name} does not have an FQDN") self.fqdn = self.data["FQDN"] - self.id = gen_id_from_yaml(self.data, self.name) + self.id = self.data['ID'] def get_stashcache_files(self, global_data, legacy): """Gets a resources Cache files as a dictionary""" @@ -446,6 +447,7 @@ def _expand_rg(self) -> OrderedDict: "SupportCenter", "GroupDescription", "IsCCStar"]) new_rg.update({"Disable": False}) new_rg.update(self.data) + new_rg['GroupID'] = gen_id_from_yaml(self.data, self.name, "GroupID") new_rg["Facility"] = self.site.facility.get_tree() new_rg["Site"] = self.site.get_tree() From 330e69c506fe3d4c106dcc58c14b230becd17a36 Mon Sep 17 00:00:00 2001 From: Doug Benjamin Date: Fri, 18 Aug 2023 07:23:44 -0500 Subject: [PATCH 131/184] HTCondor and dCache upgrades --- .../BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml | 377 ++++++++++++++++++ 1 file changed, 377 insertions(+) diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml index b8ddecb4c..3f64aaa87 100644 --- a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml +++ b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml @@ -1104,3 +1104,380 @@ Services: - net.perfSONAR.Latency # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603394 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_1 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603395 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_2 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603396 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_3 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603397 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_4 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603398 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_6 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603399 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_7 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603400 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_8 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603401 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_CVMFS_Squid + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603402 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_Frontier_Squid + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603403 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE + Services: + - SRMv2.disk + - SRMv2.tape +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603404 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_East + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603405 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_West + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603406 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_West2 + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603407 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_GRIDFTP + Services: + - WebDAV +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603408 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: lhcmon-bnl + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603409 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: lhcperfmon-bnl + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603410 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: ps-development + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603394 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_1 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603395 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_2 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603396 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_3 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603397 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_4 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603398 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_6 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603399 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_7 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603400 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_8 + Services: + - CE +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603401 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_CVMFS_Squid + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603402 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_Frontier_Squid + Services: + - Squid +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603403 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE + Services: + - SRMv2.disk + - SRMv2.tape +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603404 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_East + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603405 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_West + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603406 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_AWS_West2 + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603407 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: BNL_ATLAS_SE_GRIDFTP + Services: + - WebDAV +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603408 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: lhcmon-bnl + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603409 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: lhcperfmon-bnl + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- +- Class: SCHEDULED + ID: 1573603410 + Description: HTCondor upgrade and dCache version upgrade + Severity: Outage + StartTime: Aug 29, 2023 13:00 +0000 + EndTime: Aug 29, 2023 17:00 +0000 + CreatedTime: Aug 18, 2023 12:05 +0000 + ResourceName: ps-development + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- + From 6514e480fa804832ed55374bf123ca560620071a Mon Sep 17 00:00:00 2001 From: Doug Benjamin Date: Fri, 18 Aug 2023 07:33:31 -0500 Subject: [PATCH 132/184] HTCondor and dCache upgrades --- .../BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml | 189 ------------------ 1 file changed, 189 deletions(-) diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml index 3f64aaa87..1bad7188a 100644 --- a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml +++ b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml @@ -1292,192 +1292,3 @@ Services: - net.perfSONAR.Latency # --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603394 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_1 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603395 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_2 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603396 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_3 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603397 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_4 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603398 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_6 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603399 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_7 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603400 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_8 - Services: - - CE -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603401 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_CVMFS_Squid - Services: - - Squid -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603402 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_Frontier_Squid - Services: - - Squid -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603403 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_SE - Services: - - SRMv2.disk - - SRMv2.tape -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603404 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_SE_AWS_East - Services: - - SRMv2 -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603405 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_SE_AWS_West - Services: - - SRMv2 -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603406 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_SE_AWS_West2 - Services: - - SRMv2 -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603407 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_SE_GRIDFTP - Services: - - WebDAV -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603408 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: lhcmon-bnl - Services: - - net.perfSONAR.Bandwidth -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603409 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: lhcperfmon-bnl - Services: - - net.perfSONAR.Latency -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603410 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: ps-development - Services: - - net.perfSONAR.Latency -# --------------------------------------------------------- - From de76b43417b1aa41927d946dd6ec298dcedaef56 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 18 Aug 2023 08:40:38 -0500 Subject: [PATCH 133/184] clean up comments --- src/webapp/project_reader.py | 3 +-- src/webapp/rg_reader.py | 2 +- src/webapp/topology.py | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/webapp/project_reader.py b/src/webapp/project_reader.py index 10468ea60..29e4b3fea 100755 --- a/src/webapp/project_reader.py +++ b/src/webapp/project_reader.py @@ -71,8 +71,7 @@ def get_one_project(file: str, campus_grid_ids: Dict, vos_data: VOsData) -> Dict else: data['Name'] = name_from_filename - data['ID'] = str(gen_id_from_yaml(data, data['Name'])) - + data["ID"] = str(gen_id_from_yaml(data, data["Name"])) except Exception as e: log.error("%r adding project %s", e, file) diff --git a/src/webapp/rg_reader.py b/src/webapp/rg_reader.py index ba5f0f6b6..1d74e8c99 100755 --- a/src/webapp/rg_reader.py +++ b/src/webapp/rg_reader.py @@ -72,7 +72,7 @@ def get_topology(indir="../topology", contacts_data=None, strict=False): for facility_path in root.glob("*/FACILITY.yaml"): name = facility_path.parts[-2] facility_data = load_yaml_file(facility_path) - id_ = gen_id_from_yaml(facility_data if facility_data else {}, name) + id_ = gen_id_from_yaml(facility_data or {}, name) topology.add_facility(name, id_) for site_path in root.glob("*/*/SITE.yaml"): facility, name = site_path.parts[-3:-1] diff --git a/src/webapp/topology.py b/src/webapp/topology.py index c81ef021c..c382f6c48 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -36,7 +36,7 @@ def __init__(self, contacts: ContactsData, service_types: Dict, support_centers: # Auto-generate IDs for any services and support centers that don't have them for key, val in self.service_types.items(): - self.service_types[key] = val if val else gen_id_from_yaml({}, key) + self.service_types[key] = val or gen_id_from_yaml({}, key) for key, val in self.support_centers.items(): val['ID'] = gen_id_from_yaml(val, key) @@ -119,11 +119,11 @@ def __init__(self, name: str, yaml_data: ParsedYaml, common_data: CommonData): self.services = [] self.service_names = [n["Name"] for n in self.services if "Name" in n] self.data = yaml_data - self.data['ID'] = gen_id_from_yaml(self.data, self.name) + self.data["ID"] = gen_id_from_yaml(self.data, self.name) if is_null(yaml_data, "FQDN"): raise ValueError(f"Resource {name} does not have an FQDN") self.fqdn = self.data["FQDN"] - self.id = self.data['ID'] + self.id = self.data["ID"] def get_stashcache_files(self, global_data, legacy): """Gets a resources Cache files as a dictionary""" @@ -473,7 +473,7 @@ def __init__(self, rg: ResourceGroup, yaml_data: ParsedYaml, common_data: Common for k in ["StartTime", "EndTime", "Class", "Severity", "ResourceName", "Services"]: if is_null(yaml_data, k): raise ValueError(k) - # Downtimes aren't uniquely named, so hash an ID based on several ResourceName + StartTime + # Downtimes aren't uniquely named, so hash an ID based on ResourceName + StartTime yaml_data['ID'] = gen_id_from_yaml(yaml_data, '{ResourceName}-{StartTime}'.format(**yaml_data)) self.start_time = self.parsetime(yaml_data["StartTime"]) self.end_time = self.parsetime(yaml_data["EndTime"]) From a06730f469235b2be0ea927b29a6d180399643b0 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 18 Aug 2023 09:04:36 -0500 Subject: [PATCH 134/184] prevent md5sum based ids from overflowing signed 32 bit int --- src/webapp/common.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/webapp/common.py b/src/webapp/common.py index 785d9868d..8a9c4fb08 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -286,20 +286,19 @@ def git_clone_or_fetch_mirror(repo, git_dir, ssh_key=None) -> bool: return ok -def gen_id_from_yaml(data: dict, alternate_name: str, id_key = "ID", digits = 16, minimum = 1, hashfn=hashlib.md5) -> int: +def gen_id_from_yaml(data: dict, alternate_name: str, id_key = "ID", mod = 2 ** 31 - 1, minimum = 1, hashfn=hashlib.md5) -> int: """ Given a yaml object, return its existing ID if an ID is present, or generate a new ID for the object based on the md5sum of an alternate string value (usually the key of the object in its parent dictionary) """ - return data.get(id_key) or gen_id(alternate_name, digits, minimum, hashfn) + return data.get(id_key) or gen_id(alternate_name, mod, minimum, hashfn) -def gen_id(instr: AnyStr, digits = 16, minimum=1, hashfn=hashlib.md5) -> int: +def gen_id(instr: AnyStr, mod = 2 ** 31 - 1, minimum=1, hashfn=hashlib.md5) -> int: """ Convert a string to its integer md5sum, used to autogenerate unique IDs for entities where not otherwise specified """ instr_b = instr if isinstance(instr, bytes) else instr.encode("utf-8", "surrogateescape") - mod = (10 ** digits) - minimum return minimum + (int(hashfn(instr_b).hexdigest(), 16) % mod) From bc5980438da50c6a27ef510944a789c14f67e7e4 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 18 Aug 2023 13:15:05 -0500 Subject: [PATCH 135/184] Add missing ID to FSU-HNPGRID-OSDF-Origin --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index c50d10c85..b90bf66e3 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -69,7 +69,7 @@ Resources: Name: Sean Dobbs Description: OSDF Origin server for FSU-HNPGRID FQDN: npgrid.fsu.edu - ID: + ID: 1476 Services: XRootD origin server: Description: OSDF Origin server for FSU-HNPGRID From 05197d0744edcb1088f7df6263d8b6538d4eff40 Mon Sep 17 00:00:00 2001 From: Sean Dobbs Date: Fri, 18 Aug 2023 15:29:10 -0400 Subject: [PATCH 136/184] Update OSG_US_FSU_HNPGRID.yaml Add AllowedVOs entry --- .../FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml index b90bf66e3..89019298a 100644 --- a/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml +++ b/topology/Florida State University/FSU_HNPGRID/OSG_US_FSU_HNPGRID.yaml @@ -75,6 +75,8 @@ Resources: Description: OSDF Origin server for FSU-HNPGRID Details: hidden: false + AllowedVOs: + - Gluex VOOwnership: Gluex: 100 SupportCenter: UChicago From 6257975c2a3e1228d4ccfd9cac9d05cff9a058cd Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 18 Aug 2023 16:29:00 -0500 Subject: [PATCH 137/184] Bump resource ID to avoid collision --- topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml index 6085b7ddc..26a69c27b 100644 --- a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml +++ b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml @@ -43,7 +43,7 @@ Resources: Name: Nathan Crawford Description: SLATE deployed Hosted CE for the GPAtlas Cluster FQDN: uci-gpatlas-ce1.svc.opensciencegrid.org - ID: 1476 + ID: 1477 Services: CE: Description: Compute Element From d4cb7c12b09170303adc9dbbceb8bc63d3ad5df9 Mon Sep 17 00:00:00 2001 From: ddavila0 Date: Sat, 19 Aug 2023 13:33:41 -0700 Subject: [PATCH 138/184] Update UCSDT2_downtime.yaml downtime due to storm --- .../UCSD CMS Tier2/UCSDT2_downtime.yaml | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml b/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml index 1bafaeefd..ac89faf82 100644 --- a/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml +++ b/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml @@ -1587,3 +1587,190 @@ Services: - CE # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764611 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDCMST2-2-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764612 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDCMST2-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764613 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-A + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764614 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-B + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764615 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-C + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764616 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764617 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-1-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764618 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-2-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764619 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-3-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764620 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-4-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764621 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-5-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764622 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-Cloud-6-squid + Services: + - Squid +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764623 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-D + Services: + - CE +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764624 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-SE1 + Services: + - GridFtp +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764625 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: UCSDT2-SE3 + Services: + - SRMv2 +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764626 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: US-UCSD BW + Services: + - net.perfSONAR.Bandwidth +# --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1574764627 + Description: storm + Severity: Outage + StartTime: Aug 19, 2023 23:00 +0000 + EndTime: Aug 23, 2023 00:00 +0000 + CreatedTime: Aug 19, 2023 20:21 +0000 + ResourceName: US-UCSD LT + Services: + - net.perfSONAR.Latency +# --------------------------------------------------------- From 10628fac52e8ee196cd748baf0b0c1a25fe56eb5 Mon Sep 17 00:00:00 2001 From: edubach <124012043+edubach@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:57:50 +0100 Subject: [PATCH 139/184] Update NET2.yaml storage values changing StorageCapaity* from 2000 to 2685 --- .../University of Massachusetts - Amherst/NET2/NET2.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml index 77fbeda4b..7fc7b2dc4 100644 --- a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -39,8 +39,8 @@ Resources: InteropMonitoring: true KSI2KMax: 0 KSI2KMin: 0 - StorageCapacityMax: 2000 - StorageCapacityMin: 2000 + StorageCapacityMax: 2685 + StorageCapacityMin: 2685 TapeCapacity: 0 NET2_SE_XRootD: Active: true @@ -78,8 +78,8 @@ Resources: InteropMonitoring: true KSI2KMax: 0 KSI2KMin: 0 - StorageCapacityMax: 2000 - StorageCapacityMin: 2000 + StorageCapacityMax: 2685 + StorageCapacityMin: 2685 TapeCapacity: 0 NET2-PS-BW: Active: true From 0d35c278f54ba49d254f6712ec983a309781bc4a Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:25:07 -0500 Subject: [PATCH 140/184] Create FIU_Guo.yaml --- projects/FIU_Guo.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/FIU_Guo.yaml diff --git a/projects/FIU_Guo.yaml b/projects/FIU_Guo.yaml new file mode 100644 index 000000000..8bcad1f21 --- /dev/null +++ b/projects/FIU_Guo.yaml @@ -0,0 +1,9 @@ +Description: > + My research in experimental nuclear physics requires large amounts of + simulations. These simulations are independent of one another and the OSPool is + very well suited for these tasks. Access to the OSG computing resources would be + a useful asset for my research. +Department: College of Arts and Science +FieldOfScience: Physics +Organization: Florida International University +PIName: Lei Guo From 09f365cbca9c036b8129dd73edf78670ae5caa5c Mon Sep 17 00:00:00 2001 From: ddavila0 Date: Mon, 21 Aug 2023 16:12:43 -0700 Subject: [PATCH 141/184] Update UCSDT2_downtime.yaml we decided to cut the downtime short due to the services being ready --- .../UCSD CMS Tier2/UCSDT2_downtime.yaml | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml b/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml index ac89faf82..19834b95f 100644 --- a/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml +++ b/topology/University of California San Diego/UCSD CMS Tier2/UCSDT2_downtime.yaml @@ -1592,7 +1592,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDCMST2-2-squid Services: @@ -1603,7 +1603,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDCMST2-squid Services: @@ -1614,7 +1614,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-A Services: @@ -1625,7 +1625,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-B Services: @@ -1636,7 +1636,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-C Services: @@ -1647,7 +1647,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud Services: @@ -1658,7 +1658,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-1-squid Services: @@ -1669,7 +1669,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-2-squid Services: @@ -1680,7 +1680,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-3-squid Services: @@ -1691,7 +1691,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-4-squid Services: @@ -1702,7 +1702,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-5-squid Services: @@ -1713,7 +1713,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-Cloud-6-squid Services: @@ -1724,7 +1724,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-D Services: @@ -1735,7 +1735,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-SE1 Services: @@ -1746,7 +1746,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: UCSDT2-SE3 Services: @@ -1757,7 +1757,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: US-UCSD BW Services: @@ -1768,7 +1768,7 @@ Description: storm Severity: Outage StartTime: Aug 19, 2023 23:00 +0000 - EndTime: Aug 23, 2023 00:00 +0000 + EndTime: Aug 22, 2023 00:00 +0000 CreatedTime: Aug 19, 2023 20:21 +0000 ResourceName: US-UCSD LT Services: From 59e5e888354b0e60f8bf06cf5f1cf371f9891120 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 22 Aug 2023 23:28:36 -0500 Subject: [PATCH 142/184] Create NMSU_Lawson.yaml --- projects/NMSU_Lawson.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/NMSU_Lawson.yaml diff --git a/projects/NMSU_Lawson.yaml b/projects/NMSU_Lawson.yaml new file mode 100644 index 000000000..467421f08 --- /dev/null +++ b/projects/NMSU_Lawson.yaml @@ -0,0 +1,9 @@ +Description: > + I am requesting an OSPool project for my postdoctoral research investigating + drivers of population decline for the American Kestrel, a raptor species that breeds + across North America. I plan to use OSG resources to compile my environmental data + and fit statistical models. +Department: Fish, Wildlife, and Conservation Ecology +FieldOfScience: Ecological and Environmental Sciences +Organization: New Mexico State University +PIName: Abigail Lawson From 50ad36b7429e1a0e8d0f5ca630c7fe5be96b4592 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 23 Aug 2023 08:40:47 -0500 Subject: [PATCH 143/184] Create NCSU_Gray.yaml --- projects/NCSU_Gray.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 projects/NCSU_Gray.yaml diff --git a/projects/NCSU_Gray.yaml b/projects/NCSU_Gray.yaml new file mode 100644 index 000000000..494d79ae7 --- /dev/null +++ b/projects/NCSU_Gray.yaml @@ -0,0 +1,9 @@ +Description: > + Map and characterize global change, and to understand the consequences of these changes for the Earth system and society. + Anthropogenic changes to vegetation (e.g. cropping systems, deforestation, etc.) are of particular interest. + Example research questions include: How can we feed a growing population without running out of water? + Have tropical deforestation mitigation policies been effective? How is vegetation phenology changing in response to a changing climate? +Department: Center for Geospatial Analytics +FieldOfScience: Geosciences +Organization: North Carolina State University +PIName: Josh Gray From ce6e1f5246729a0ac1d3677fab8e93c5e9442202 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 23 Aug 2023 08:53:41 -0500 Subject: [PATCH 144/184] require an ID for downtimes --- src/webapp/topology.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/webapp/topology.py b/src/webapp/topology.py index c382f6c48..6630baff6 100644 --- a/src/webapp/topology.py +++ b/src/webapp/topology.py @@ -470,11 +470,9 @@ class Downtime(object): def __init__(self, rg: ResourceGroup, yaml_data: ParsedYaml, common_data: CommonData): self.rg = rg self.data = yaml_data - for k in ["StartTime", "EndTime", "Class", "Severity", "ResourceName", "Services"]: + for k in ["StartTime", "EndTime", "ID", "Class", "Severity", "ResourceName", "Services"]: if is_null(yaml_data, k): raise ValueError(k) - # Downtimes aren't uniquely named, so hash an ID based on ResourceName + StartTime - yaml_data['ID'] = gen_id_from_yaml(yaml_data, '{ResourceName}-{StartTime}'.format(**yaml_data)) self.start_time = self.parsetime(yaml_data["StartTime"]) self.end_time = self.parsetime(yaml_data["EndTime"]) self.created_time = None From 2df89f70e5643fd54ac9ed8ac6132837fbedb203 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 24 Aug 2023 08:27:19 -0500 Subject: [PATCH 145/184] sets uci ce active to false --- topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml index 26a69c27b..718212549 100644 --- a/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml +++ b/topology/UC Irvine/UCIT3/UCI-GPATLAS.yaml @@ -4,7 +4,7 @@ Production: true SupportCenter: Self Supported Resources: UCI-GPATLAS: - Active: true + Active: false ContactLists: Administrative Contact: Primary: From 2d1b7959f388b8554c193757f4ada0710be1d0b4 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 24 Aug 2023 15:57:14 -0500 Subject: [PATCH 146/184] Allow all new UC OSPool APs to access /ospool/uc-shared See c3524138ac8d46eee2a3c33cb75fac50acab41c4 for an explanation why --- virtual-organizations/OSG.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 7ef021a76..62b75e741 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -180,7 +180,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap20.uc.osg-htc.org:1094/ospool/ap20 - Base Path: /ospool/ap20 + Base Path: /ospool/ap20, /ospool/uc-shared Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap20 @@ -197,7 +197,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap21.uc.osg-htc.org:1094/ospool/ap21 - Base Path: /ospool/ap21 + Base Path: /ospool/ap21, /ospool/uc-shared Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap21 @@ -214,7 +214,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap22.uc.osg-htc.org:1094/ospool/ap22 - Base Path: /ospool/ap22 + Base Path: /ospool/ap22, /ospool/uc-shared Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap22 @@ -233,6 +233,18 @@ DataFederations: Issuer: https://osg-htc.org/ospool/uc-shared Base Path: /ospool/uc-shared Map Subject: True + - SciTokens: + Issuer: https://ap20.uc.osg-htc.org:1094/ospool/ap20 + Base Path: /ospool/ap20, /ospool/uc-shared + Map Subject: True + - SciTokens: + Issuer: https://ap21.uc.osg-htc.org:1094/ospool/ap21 + Base Path: /ospool/ap21, /ospool/uc-shared + Map Subject: True + - SciTokens: + Issuer: https://ap22.uc.osg-htc.org:1094/ospool/ap22 + Base Path: /ospool/ap22, /ospool/uc-shared + Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap23 AllowedCaches: From 514a4e555f330c4f33adcbababb07e043731e3d9 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Thu, 24 Aug 2023 14:42:12 -0700 Subject: [PATCH 147/184] Added Arizona gateway node --- .../ResearchTechnologies.yaml | 25 +++++++++++++++++++ .../Research Technologies/SITE.yaml | 8 ++++++ 2 files changed, 33 insertions(+) create mode 100644 topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml create mode 100644 topology/University of Arizona/Research Technologies/SITE.yaml diff --git a/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml b/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml new file mode 100644 index 000000000..f64d7225c --- /dev/null +++ b/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml @@ -0,0 +1,25 @@ +GroupDescription: ResearchTechnologies +GroupID: 1366 +Production: true +Resources: + Gateway: + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000526 + Name: Devin Richard Bayly + Security Contact: + Primary: + ID: OSG1000526 + Name: Devin Richard Bayly + Description: Science gateway node on Jestream2 + FQDN: js-172-93.jetstream-cloud.org + ID: 1478 + Services: + Submit Node: + Description: Science gateway OSPool access point + Details: + hidden: false + Tags: + - OSPool +SupportCenter: Self Supported diff --git a/topology/University of Arizona/Research Technologies/SITE.yaml b/topology/University of Arizona/Research Technologies/SITE.yaml new file mode 100644 index 000000000..fe4b0f4a2 --- /dev/null +++ b/topology/University of Arizona/Research Technologies/SITE.yaml @@ -0,0 +1,8 @@ +City: Tucson +Country: United States +Description: University of Arizona Research Technologies +ID: 10207 +Latitude: 32.229874 +Longitude: -110.953947 +State: Arizona +Zipcode: '85719' From f69ded97ade20960a78e98a2c7ad5d7a4be2051d Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Thu, 24 Aug 2023 14:43:09 -0700 Subject: [PATCH 148/184] Adjusted ID --- topology/University of Arizona/Research Technologies/SITE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Arizona/Research Technologies/SITE.yaml b/topology/University of Arizona/Research Technologies/SITE.yaml index fe4b0f4a2..921b9b949 100644 --- a/topology/University of Arizona/Research Technologies/SITE.yaml +++ b/topology/University of Arizona/Research Technologies/SITE.yaml @@ -1,7 +1,7 @@ City: Tucson Country: United States Description: University of Arizona Research Technologies -ID: 10207 +ID: 10367 Latitude: 32.229874 Longitude: -110.953947 State: Arizona From 73f8334c7120e482f2b4bc19e8896d8ae39989aa Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Thu, 24 Aug 2023 16:55:34 -0500 Subject: [PATCH 149/184] Revert "Allow all new UC OSPool APs to access /ospool/uc-shared" This reverts commit 2d1b7959f388b8554c193757f4ada0710be1d0b4. --- virtual-organizations/OSG.yaml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 62b75e741..7ef021a76 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -180,7 +180,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap20.uc.osg-htc.org:1094/ospool/ap20 - Base Path: /ospool/ap20, /ospool/uc-shared + Base Path: /ospool/ap20 Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap20 @@ -197,7 +197,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap21.uc.osg-htc.org:1094/ospool/ap21 - Base Path: /ospool/ap21, /ospool/uc-shared + Base Path: /ospool/ap21 Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap21 @@ -214,7 +214,7 @@ DataFederations: Authorizations: - SciTokens: Issuer: https://ap22.uc.osg-htc.org:1094/ospool/ap22 - Base Path: /ospool/ap22, /ospool/uc-shared + Base Path: /ospool/ap22 Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap22 @@ -233,18 +233,6 @@ DataFederations: Issuer: https://osg-htc.org/ospool/uc-shared Base Path: /ospool/uc-shared Map Subject: True - - SciTokens: - Issuer: https://ap20.uc.osg-htc.org:1094/ospool/ap20 - Base Path: /ospool/ap20, /ospool/uc-shared - Map Subject: True - - SciTokens: - Issuer: https://ap21.uc.osg-htc.org:1094/ospool/ap21 - Base Path: /ospool/ap21, /ospool/uc-shared - Map Subject: True - - SciTokens: - Issuer: https://ap22.uc.osg-htc.org:1094/ospool/ap22 - Base Path: /ospool/ap22, /ospool/uc-shared - Map Subject: True AllowedOrigins: - UChicago_OSGConnect_ap23 AllowedCaches: From 3ad2f3be5f4b0d4aac7676f4555df7e06ac30045 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Thu, 24 Aug 2023 14:59:11 -0700 Subject: [PATCH 150/184] Update topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml Co-authored-by: Matyas Selmeci --- .../Research Technologies/ResearchTechnologies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml b/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml index f64d7225c..d9a745862 100644 --- a/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml +++ b/topology/University of Arizona/Research Technologies/ResearchTechnologies.yaml @@ -2,7 +2,7 @@ GroupDescription: ResearchTechnologies GroupID: 1366 Production: true Resources: - Gateway: + Arizona-ResearchTechnologies-Gateway: ContactLists: Administrative Contact: Primary: From a1bf28d533165695ef9378e7dd42040841c7e390 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 24 Aug 2023 17:03:26 -0500 Subject: [PATCH 151/184] /ospool/uc-shared/public should be public --- virtual-organizations/OSG.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/virtual-organizations/OSG.yaml b/virtual-organizations/OSG.yaml index 7ef021a76..5a15d4ef5 100644 --- a/virtual-organizations/OSG.yaml +++ b/virtual-organizations/OSG.yaml @@ -243,3 +243,18 @@ DataFederations: Strategy: OAuth2 Issuer: https://osg-htc.org/ospool/uc-shared MaxScopeDepth: 4 + + - Path: /ospool/uc-shared/public + Authorizations: + - PUBLIC + AllowedOrigins: + - UChicago_OSGConnect_ap23 + AllowedCaches: + - ANY + Writeback: 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 + MaxScopeDepth: 4 + From e933c3c7480b711a8762d1f0e2a113defe21679e Mon Sep 17 00:00:00 2001 From: Doug Benjamin Date: Fri, 25 Aug 2023 09:21:19 -0500 Subject: [PATCH 152/184] Update BNL-ATLAS_downtime.yaml extend the downtime for Storage resources and remove the downtime for the personar resources and the squid resources --- .../BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml | 66 ++----------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml index 1bad7188a..37c8f9d34 100644 --- a/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml +++ b/topology/Brookhaven National Laboratory/BNL ATLAS Tier1/BNL-ATLAS_downtime.yaml @@ -1181,34 +1181,12 @@ Services: - CE # --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603401 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_CVMFS_Squid - Services: - - Squid -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603402 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: BNL_ATLAS_Frontier_Squid - Services: - - Squid -# --------------------------------------------------------- - Class: SCHEDULED ID: 1573603403 Description: HTCondor upgrade and dCache version upgrade Severity: Outage StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 + EndTime: Aug 29, 2023 19:00 +0000 CreatedTime: Aug 18, 2023 12:05 +0000 ResourceName: BNL_ATLAS_SE Services: @@ -1220,7 +1198,7 @@ Description: HTCondor upgrade and dCache version upgrade Severity: Outage StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 + EndTime: Aug 29, 2023 19:00 +0000 CreatedTime: Aug 18, 2023 12:05 +0000 ResourceName: BNL_ATLAS_SE_AWS_East Services: @@ -1231,7 +1209,7 @@ Description: HTCondor upgrade and dCache version upgrade Severity: Outage StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 + EndTime: Aug 29, 2023 19:00 +0000 CreatedTime: Aug 18, 2023 12:05 +0000 ResourceName: BNL_ATLAS_SE_AWS_West Services: @@ -1242,7 +1220,7 @@ Description: HTCondor upgrade and dCache version upgrade Severity: Outage StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 + EndTime: Aug 29, 2023 19:00 +0000 CreatedTime: Aug 18, 2023 12:05 +0000 ResourceName: BNL_ATLAS_SE_AWS_West2 Services: @@ -1253,42 +1231,8 @@ Description: HTCondor upgrade and dCache version upgrade Severity: Outage StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 + EndTime: Aug 29, 2023 19:00 +0000 CreatedTime: Aug 18, 2023 12:05 +0000 ResourceName: BNL_ATLAS_SE_GRIDFTP Services: - WebDAV -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603408 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: lhcmon-bnl - Services: - - net.perfSONAR.Bandwidth -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603409 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: lhcperfmon-bnl - Services: - - net.perfSONAR.Latency -# --------------------------------------------------------- -- Class: SCHEDULED - ID: 1573603410 - Description: HTCondor upgrade and dCache version upgrade - Severity: Outage - StartTime: Aug 29, 2023 13:00 +0000 - EndTime: Aug 29, 2023 17:00 +0000 - CreatedTime: Aug 18, 2023 12:05 +0000 - ResourceName: ps-development - Services: - - net.perfSONAR.Latency -# --------------------------------------------------------- From ec029a63ba12fb9afe839c4eedb72c9aaa516894 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Fri, 25 Aug 2023 09:19:56 -0700 Subject: [PATCH 153/184] New project: UTSA_Anantua --- projects/UTSA_Anantua.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/UTSA_Anantua.yaml diff --git a/projects/UTSA_Anantua.yaml b/projects/UTSA_Anantua.yaml new file mode 100644 index 000000000..3b720399d --- /dev/null +++ b/projects/UTSA_Anantua.yaml @@ -0,0 +1,8 @@ +Description: > + I am using Monte Carlo ray-tracing code GRMONTY to create and + compare two different emission models R-Beta and Critical-Beta + of M87 and Sgr A*. https://richardanantua.com/spectra/ +Department: Department of Physics and Astronomy +FieldOfScience: Astronomy and Astrophysics +Organization: University of Texas at San Antonio +PIName: Richard Anantua From e4b7619b0b991230e4c0fa7b8fad2a5d0b2ad097 Mon Sep 17 00:00:00 2001 From: Tim Cartwright Date: Tue, 29 Aug 2023 11:56:17 -0500 Subject: [PATCH 154/184] Put ORU in downtime (FD #74163) --- .../ORU - Computing Group/ORU-Titan_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Oral Roberts University/ORU - Computing Group/ORU-Titan_downtime.yaml diff --git a/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan_downtime.yaml b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan_downtime.yaml new file mode 100644 index 000000000..586709d13 --- /dev/null +++ b/topology/Oral Roberts University/ORU - Computing Group/ORU-Titan_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1583274687 + Description: 'Excessive network usage (FD #74163)' + Severity: Outage + StartTime: Aug 28, 2023 23:08 +0000 + EndTime: Jan 01, 2025 04:59 +0000 + CreatedTime: Aug 29, 2023 16:44 +0000 + ResourceName: ORU-Titan-CE1 + Services: + - CE +# --------------------------------------------------------- From 8c792b5002f0bab5cd6ca75ddc42d0f1ef373656 Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Tue, 29 Aug 2023 10:15:39 -0700 Subject: [PATCH 155/184] Project rename: xenon --- projects/xenon.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 projects/xenon.yaml diff --git a/projects/xenon.yaml b/projects/xenon.yaml new file mode 100644 index 000000000..5a40f8cde --- /dev/null +++ b/projects/xenon.yaml @@ -0,0 +1,17 @@ +Department: Physics +Description: The XENON Dark Matter Experiment located at the Gran Sasso Laboratories + (INFN, Italy), is currently the leader world project searching for the so called + Dark Matter, something which is completely different from ordinary matter. This + Dark Matter is not (as the name hints) visible, but it should pervade the entire + Universe. Its presence has been confirmed by different experimental evidences, however + its intrinsic nature is one of the big puzzle of Modern Physics. The XENON Experiment + could reveal the nature of the DM looking at the possible interactions of the DM + with ordinary matter, for instance with the Xenon, a noble gas been liquified at + very low temperature. The study of the background signal, from the environment and + from the materials that make up the new detector containing the Xenon, is essential + to understand the detector's behavior and its implications on its performances. +FieldOfScience: Astrophysics +Organization: University of Chicago +PIName: Luca Grandi + + From 627341d8bfd99422dfcc34ef940f863f66e864c8 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Tue, 29 Aug 2023 15:31:57 -0500 Subject: [PATCH 156/184] Add MOLLER IDs and contacts (FD#73358) --- virtual-organizations/MOLLER.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/virtual-organizations/MOLLER.yaml b/virtual-organizations/MOLLER.yaml index 96610eb1a..b3faaee25 100644 --- a/virtual-organizations/MOLLER.yaml +++ b/virtual-organizations/MOLLER.yaml @@ -11,7 +11,7 @@ CertificateOnly: false # If you have an up-to-date local git clone, fill ID with the output from `bin/next_virtual_organization_id` # Otherwise, leave it blank and we will fill in the appropriate value for you. -ID: +ID: 235 # Contacts contain information about people to contact regarding this VO. # The "ID" is a hash of their email address available at https://topology.opensciencegrid.org/miscuser/xml @@ -20,14 +20,18 @@ ID: Contacts: # Administrative Contact is a list of people to contact regarding administrative issues Administrative Contact: - - ID: - Name: + - ID: OSG1000510 + Name: Rakitha S Beminiwattha + - ID: OSG1000460 + Name: Sakib Rahman # - ... # Security Contact is a list of people to contact regarding security issues Security Contact: - - ID: - Name: + - ID: OSG1000510 + Name: Rakitha S Beminiwattha + - ID: OSG1000460 + Name: Sakib Rahman # - ... ### Registration Authority (optional) is a list of people to contact regarding registration issues From c0dd30eaed80a957cbd368ee448ce7b4001a7925 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 29 Aug 2023 13:50:18 -0700 Subject: [PATCH 157/184] Fixing Address and zipcode Fixing Address and zipcode --- topology/Universidade Estadual Paulista/SPRACE/SITE.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/topology/Universidade Estadual Paulista/SPRACE/SITE.yaml b/topology/Universidade Estadual Paulista/SPRACE/SITE.yaml index 8f9eaa151..2da32c6e3 100644 --- a/topology/Universidade Estadual Paulista/SPRACE/SITE.yaml +++ b/topology/Universidade Estadual Paulista/SPRACE/SITE.yaml @@ -1,6 +1,5 @@ -AddressLine1: "R. Dr. Bento Teobaldo Ferraz 271 - Bl. II - Barra Funda 01140-070 -\ - \ S\xE3o Paulo" -City: São Paulo +AddressLine1: "R. Dr. Bento Teobaldo Ferraz 271 - Bl. II - Barra Funda - Sao Paulo" +City: Sao Paulo Country: Brazil ID: 10017 Latitude: -23.52433 From 8ffc4b85e14fe90044d2e728123d6bbd868c7617 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Tue, 29 Aug 2023 23:33:54 -0500 Subject: [PATCH 158/184] Create Emory_Pesavento.yaml --- projects/Emory_Pesavento.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 projects/Emory_Pesavento.yaml diff --git a/projects/Emory_Pesavento.yaml b/projects/Emory_Pesavento.yaml new file mode 100644 index 000000000..b259a7bd2 --- /dev/null +++ b/projects/Emory_Pesavento.yaml @@ -0,0 +1,16 @@ +Department: Economics +Description: > + The goal of our research project is to develop a new technique to estimate + impulse response functions in Time-varying-parameters vector autoregressive models + (in short: TVP-VARs). TVP-VARs are particularly useful because, unlike traditional + VAR models, they accounts for changing economic conditions by allowing parameters + to change over time. Estimating impulse responses (one of the main tools in + macroeconomic analysis) in a TVP-VAR requires the implementation of Markov Chain + Montecarlo algorithms (such as Gibbs sampling). This is a computationally demanding + task in a TVP-VAR framework, due to the huge number of parameters to estimate. + However, we could substantially ease such task by using parallel computing + techniques. In this way, we could provide policy makers with a more realistic + and flexible framework use to perform macroeconomic policy evaluation." +FieldOfScience: Economics +Organization: Emory University +PIName: Elena Pesavento From 685a253ae1cf1b85d93e66245546a5ea0db16e46 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 30 Aug 2023 08:58:11 -0500 Subject: [PATCH 159/184] Update projects/Emory_Pesavento.yaml --- projects/Emory_Pesavento.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/Emory_Pesavento.yaml b/projects/Emory_Pesavento.yaml index b259a7bd2..cc1dab4db 100644 --- a/projects/Emory_Pesavento.yaml +++ b/projects/Emory_Pesavento.yaml @@ -12,5 +12,5 @@ Description: > techniques. In this way, we could provide policy makers with a more realistic and flexible framework use to perform macroeconomic policy evaluation." FieldOfScience: Economics -Organization: Emory University +Organization: Emory University PIName: Elena Pesavento From e29f9988bd70cbb99c0548e15d6ad7b8ba4f05c8 Mon Sep 17 00:00:00 2001 From: Showmic Islam <57932760+showmic09@users.noreply.github.com> Date: Wed, 30 Aug 2023 13:57:26 -0500 Subject: [PATCH 160/184] Create Vanderbilt_Paquet.yaml --- projects/Vanderbilt_Paquet.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 projects/Vanderbilt_Paquet.yaml diff --git a/projects/Vanderbilt_Paquet.yaml b/projects/Vanderbilt_Paquet.yaml new file mode 100644 index 000000000..d043e4689 --- /dev/null +++ b/projects/Vanderbilt_Paquet.yaml @@ -0,0 +1,8 @@ +Description: > + study the quark-gluon plasma produced in collisions of nuclei. I perform relativistic hydrodynamic simulations of the collisions and + study in particular the production of photons in the collisions. This is my Vanderbilt website: https://as.vanderbilt.edu/physics-astronomy/bio/jean-francois-paquet/ + This is my professional website: https://j-f-paquet.github.io/ +Department: Department of Physics & Astronomy +FieldOfScience: Physics +Organization: Vanderbilt University +PIName: Jean-Francois Paquet From d33d0ede83bd92cf92406f158b8f37a6595def2b Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 30 Aug 2023 14:14:37 -0500 Subject: [PATCH 161/184] Remove unnecessary ID --- projects/Etown_Wittmeyer.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/Etown_Wittmeyer.yaml b/projects/Etown_Wittmeyer.yaml index 8f19a77fa..d17be6c56 100644 --- a/projects/Etown_Wittmeyer.yaml +++ b/projects/Etown_Wittmeyer.yaml @@ -4,8 +4,6 @@ FieldOfScience: Psychology and Life Sciences Organization: Elizabethtown College PIName: Jennifer Legault Wittmeyer -ID: '591' - Sponsor: CampusGrid: Name: OSG Connect From c867ad9ce8d2de1a42d50956f83f9f65a778ea90 Mon Sep 17 00:00:00 2001 From: Ashton Graves Date: Thu, 31 Aug 2023 10:00:22 -0500 Subject: [PATCH 162/184] Updates fqdn for tacc frontera --- .../Texas Advanced Computing Center/TACC-Frontera.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/University of Texas at Austin/Texas Advanced Computing Center/TACC-Frontera.yaml b/topology/University of Texas at Austin/Texas Advanced Computing Center/TACC-Frontera.yaml index f0d195209..296727d86 100644 --- a/topology/University of Texas at Austin/Texas Advanced Computing Center/TACC-Frontera.yaml +++ b/topology/University of Texas at Austin/Texas Advanced Computing Center/TACC-Frontera.yaml @@ -65,7 +65,7 @@ Resources: ID: 7e5c0c5967de0a65bc78cbbb441a05d70603cabe # FQDN is the fully qualified domain name of the host running this resource - FQDN: tacc-frontera-ce1.services.opensciencegrid.org + FQDN: tacc-frontera-ce1.svc.opensciencegrid.org ### FQDNAliases (optional) are any other DNS aliases by which this host can be accessed # FQDNAliases: # - From 4ce4378d42cdfa3abe929f92573dae8bcddad44f Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 31 Aug 2023 09:41:29 -0700 Subject: [PATCH 163/184] Changing the main main adm contact Changing the main main adm contact --- .../FermiGrid/FNAL_OSDF.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF.yaml index b2413f1d3..5d0e14847 100644 --- a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF.yaml +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNAL_OSDF.yaml @@ -1,6 +1,6 @@ Production: true SupportCenter: Community Support Center -GroupDescription: Fermilab origins used as redirectors for xCache +GroupDescription: Fermilab origins used as redirectors for OSDF cache GroupID: 1354 Resources: FNAL_OSDF_ORIGIN: @@ -10,8 +10,8 @@ Resources: ContactLists: Administrative Contact: Primary: - ID: OSG1000162 - Name: Fabio Andrijauskas + ID: OSG1000528 + Name: Lorena Lobato Pardavila Security Contact: Primary: ID: 28e35fff676197be119af149e37c24b444179d0a @@ -21,5 +21,4 @@ Resources: XRootD origin server: Description: Stash Origin AllowedVOs: - - ANY - + - ANY From 3b6717ad9bbf65d0a64fe66be98c3ad2e88c7f6a Mon Sep 17 00:00:00 2001 From: Mats Rynge Date: Thu, 31 Aug 2023 09:58:04 -0700 Subject: [PATCH 164/184] Correct the org name --- projects/UTSA_Anantua.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/UTSA_Anantua.yaml b/projects/UTSA_Anantua.yaml index 3b720399d..4929f6028 100644 --- a/projects/UTSA_Anantua.yaml +++ b/projects/UTSA_Anantua.yaml @@ -4,5 +4,5 @@ Description: > of M87 and Sgr A*. https://richardanantua.com/spectra/ Department: Department of Physics and Astronomy FieldOfScience: Astronomy and Astrophysics -Organization: University of Texas at San Antonio +Organization: The University of Texas at San Antonio PIName: Richard Anantua From 7da5f4554437de52917d84d33cf93570282c4f27 Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Fri, 1 Sep 2023 11:44:37 -0500 Subject: [PATCH 165/184] Fix the AP40 FQDN The osg-htc.org address is the official one that we present to users --- topology/University of Wisconsin/CHTC/CHTC.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/topology/University of Wisconsin/CHTC/CHTC.yaml b/topology/University of Wisconsin/CHTC/CHTC.yaml index 3bbaa3678..25bf06eb4 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -521,10 +521,11 @@ Resources: Primary: Name: Aaron Moate ID: OSG1000015 - FQDN: ap40.chtc.wisc.edu + FQDN: ap40.uw.osg-htc.org FQDNAliases: - ap2007.chtc.wisc.edu - ospool-ap2040.chtc.wisc.edu + - ap40.chtc.wisc.edu Services: Submit Node: Description: OS Pool access point From 6abf1de7199fb30fab7946ca8b8d00150696bc5f Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Fri, 1 Sep 2023 12:23:35 -0500 Subject: [PATCH 166/184] Fix PATh contacts --- virtual-organizations/PATh.yaml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/virtual-organizations/PATh.yaml b/virtual-organizations/PATh.yaml index a9f39bd7b..8af13df2f 100644 --- a/virtual-organizations/PATh.yaml +++ b/virtual-organizations/PATh.yaml @@ -14,12 +14,14 @@ ID: 226 Contacts: # Administrative Contact is a list of people to contact regarding administrative issues Administrative Contact: - - ID: 48e1c2f26dc3479a6cf9b2de7c79d654ac27b1d1 - Name: Miron Livny - ID: OSG1000001 Name: Brian Bockelman - - ID: OSG1000018 - Name: Christina Koch + - ID: OSG1000015 + Name: Aaron Moate + - ID: OSG1000003 + Name: Brian Lin + - ID: OSG1000002 + Name: Matyas Selmeci # Security Contact is a list of people to contact regarding security issues Security Contact: @@ -27,7 +29,22 @@ Contacts: Name: Brian Bockelman - ID: OSG1000015 Name: Aaron Moate + - ID: OSG1000003 + Name: Brian Lin + - ID: OSG1000002 + Name: Matyas Selmeci + VO Manager: + - ID: 48e1c2f26dc3479a6cf9b2de7c79d654ac27b1d1 + Name: Miron Livny + - ID: OSG1000001 + Name: Brian Bockelman + - ID: OSG1000018 + Name: Christina Koch + - ID: OSG1000277 + Name: Todd Tannenbaum + - ID: c412f5f57dca8fe5c73fb3bc4e86bcf243e9edf7 + Name: Frank Wuerthwein ### Credentials (optional) define mappings of auth methods to Unix users for this VO # Credentials: From 8689367601952f3fd5a54ccb460d8426a7216376 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 1 Sep 2023 12:22:45 -0700 Subject: [PATCH 167/184] Update SingARENSingaporeInfrastructure_downtime.yaml Add downtime for SINGAPORE_INTERNET2_OSDF_CACHE due to transit to final location --- .../SingARENSingaporeInfrastructure_downtime.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml index 6aebec74a..c0333869f 100644 --- a/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml +++ b/topology/SingAREN/SingARENSingapore/SingARENSingaporeInfrastructure_downtime.yaml @@ -9,3 +9,13 @@ Services: - XRootD cache server # --------------------------------------------------------- +- Class: SCHEDULED + ID: 1585960798 + Description: On transit to final location + Severity: Outage + StartTime: Sep 01, 2023 19:30 +0000 + EndTime: Sep 30, 2023 19:30 +0000 + CreatedTime: Sep 01, 2023 19:21 +0000 + ResourceName: SINGAPORE_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server From 05adda1ab261913cd696b638b844d00f3363f8ca Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 5 Sep 2023 09:52:36 -0700 Subject: [PATCH 168/184] Add downtime for AMSTERDAM_ESNET_OSDF_CACHE due to wrong GeoiP Add downtime for AMSTERDAM_ESNET_OSDF_CACHE due to wrong GeoIP --- .../Amsterdam/EsnetAmsterdam_downtime.yaml | 10 ++++++++++ 1 file changed, 10 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..57e3ceb8f --- /dev/null +++ b/topology/Energy Sciences Network/Amsterdam/EsnetAmsterdam_downtime.yaml @@ -0,0 +1,10 @@ +- Class: UNSCHEDULED + ID: 1589326255 + Description: Wrong GeoIP + Severity: Intermittent Outage + StartTime: Sep 05, 2023 19:30 +0000 + EndTime: Sep 30, 2023 19:30 +0000 + CreatedTime: Sep 05, 2023 16:50 +0000 + ResourceName: AMSTERDAM_ESNET_OSDF_CACHE + Services: + - XRootD cache server From 8fba4516a287fa65f005715baed7b32f896eef55 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 5 Sep 2023 09:54:49 -0700 Subject: [PATCH 169/184] Add downtime for LONDON_ESNET_OSDF_CACHE due to wrong GeoiP Add downtime for LONDON_ESNET_OSDF_CACHE due to wrong GeoiP --- .../London/ESnetLondon_downtime.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 topology/Energy Sciences Network/London/ESnetLondon_downtime.yaml diff --git a/topology/Energy Sciences Network/London/ESnetLondon_downtime.yaml b/topology/Energy Sciences Network/London/ESnetLondon_downtime.yaml new file mode 100644 index 000000000..a375fd926 --- /dev/null +++ b/topology/Energy Sciences Network/London/ESnetLondon_downtime.yaml @@ -0,0 +1,10 @@ +- Class: UNSCHEDULED + ID: 1589328520 + Description: Wrong GeoIP + Severity: Intermittent Outage + StartTime: Sep 05, 2023 19:30 +0000 + EndTime: Sep 30, 2023 19:30 +0000 + CreatedTime: Sep 05, 2023 16:54 +0000 + ResourceName: LONDON_ESNET_OSDF_CACHE + Services: + - XRootD cache server From 397084e0a51f21e03dac950a14501e9c01a31f93 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 5 Sep 2023 11:26:52 -0700 Subject: [PATCH 170/184] Add downtime for JACKSONVILLE_INTERNET2_OSDF_CACHE due to network issues Add downtime for JACKSONVILLE_INTERNET2_OSDF_CACHE due to network issues. --- .../I2JacksonvilleInfrastructure_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure_downtime.yaml diff --git a/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure_downtime.yaml b/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure_downtime.yaml new file mode 100644 index 000000000..7e7cb8c2d --- /dev/null +++ b/topology/Internet2/Internet2Jacksonville/I2JacksonvilleInfrastructure_downtime.yaml @@ -0,0 +1,11 @@ +- Class: UNSCHEDULED + ID: 1589383507 + Description: no network + Severity: Outage + StartTime: Aug 31, 2023 19:30 +0000 + EndTime: Sep 29, 2023 19:30 +0000 + CreatedTime: Sep 05, 2023 18:25 +0000 + ResourceName: JACKSONVILLE_INTERNET2_OSDF_CACHE + Services: + - XRootD cache server +# --------------------------------------------------------- From 20aaacd49f0eb407c06b37000b3c0934b97a1daf Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Tue, 5 Sep 2023 11:28:20 -0700 Subject: [PATCH 171/184] Add downtime for Stashcache-KISTI due to network issues. Add downtime for Stashcache-KISTI due to network issues. --- .../KISTIPRPCachingInfrastructure_downtime.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml diff --git a/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml b/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml new file mode 100644 index 000000000..63f212684 --- /dev/null +++ b/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml @@ -0,0 +1,10 @@ +- Class: UNSCHEDULED + ID: 1589384568 + Description: no network + Severity: Outage + StartTime: Aug 31, 2023 19:30 +0000 + EndTime: Sep 29, 2023 19:30 +0000 + CreatedTime: Sep 05, 2023 18:27 +0000 + ResourceName: + Services: + - XRootD cache server From 677dde9379be9818053864d252f692b2c73ea394 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Wed, 6 Sep 2023 09:28:04 -0500 Subject: [PATCH 172/184] Add ResourceName --- .../T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml b/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml index 63f212684..363da97ba 100644 --- a/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml +++ b/topology/Korea Institute of Science and Technology Information/T3_KR_KISTI/KISTIPRPCachingInfrastructure_downtime.yaml @@ -5,6 +5,6 @@ StartTime: Aug 31, 2023 19:30 +0000 EndTime: Sep 29, 2023 19:30 +0000 CreatedTime: Sep 05, 2023 18:27 +0000 - ResourceName: + ResourceName: Stashcache-KISTI Services: - XRootD cache server From c84c8f6239f6dc6ad6fed3af55f10f9432d998db Mon Sep 17 00:00:00 2001 From: edubach <124012043+edubach@users.noreply.github.com> Date: Wed, 6 Sep 2023 23:01:25 +0100 Subject: [PATCH 173/184] Update NET2.yaml with new storage total values Update NET2.yaml with new storage total values --- .../University of Massachusetts - Amherst/NET2/NET2.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml index 7fc7b2dc4..f6b89a932 100644 --- a/topology/University of Massachusetts - Amherst/NET2/NET2.yaml +++ b/topology/University of Massachusetts - Amherst/NET2/NET2.yaml @@ -39,8 +39,8 @@ Resources: InteropMonitoring: true KSI2KMax: 0 KSI2KMin: 0 - StorageCapacityMax: 2685 - StorageCapacityMin: 2685 + StorageCapacityMax: 7395 + StorageCapacityMin: 7395 TapeCapacity: 0 NET2_SE_XRootD: Active: true @@ -78,8 +78,8 @@ Resources: InteropMonitoring: true KSI2KMax: 0 KSI2KMin: 0 - StorageCapacityMax: 2685 - StorageCapacityMin: 2685 + StorageCapacityMax: 7395 + StorageCapacityMin: 7395 TapeCapacity: 0 NET2-PS-BW: Active: true From 02744d0665af2b0e948df6df993a315ad23b80c3 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 7 Sep 2023 10:16:10 -0500 Subject: [PATCH 174/184] Delete old `XENON.yaml` (we now use `xenon.yaml` instead) Closes #3375 --- projects/XENON.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 projects/XENON.yaml diff --git a/projects/XENON.yaml b/projects/XENON.yaml deleted file mode 100644 index 58b22d6b8..000000000 --- a/projects/XENON.yaml +++ /dev/null @@ -1,23 +0,0 @@ -Department: Astrophysics -Description: The XENON Dark Matter Experiment located at the Gran Sasso Laboratories - (INFN, Italy), is currently the leader world project searching for the so called - Dark Matter, something which is completely different from ordinary matter. This - Dark Matter is not (as the name hints) visible, but it should pervade the entire - Universe. Its presence has been confirmed by different experimental evidences, however - its intrinsic nature is one of the big puzzle of Modern Physics. The XENON Experiment - could reveal the nature of the DM looking at the possible interactions of the DM - with ordinary matter, for instance with the Xenon, a noble gas been liquified at - very low temperature. The study of the background signal, from the environment and - from the materials that make up the new detector containing the Xenon (which is - currently under construction and called XENON1T), is essential to understand the - detector's behavior and its implications on its performances. For this purpose an - extensive Montecarlo simulation and study is needed, and this require quite a lot - of CPU time. The MC simulation of the XENON experiment is based on the open source - codes called GEANT4 and ROOT. -FieldOfScience: Astrophysics -ID: '15' -Organization: Columbia University -PIName: Alfio Rizzo -Sponsor: - VirtualOrganization: - Name: OSG From 1a1d2a9679ddfdc0ced95c19c0d11f1efc7502d9 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Thu, 7 Sep 2023 12:18:04 -0700 Subject: [PATCH 175/184] Update I2 caches location Update I2 caches location --- topology/Internet2/Internet2Boise/SITE.yaml | 3 +++ topology/Internet2/Internet2Chicago/SITE.yaml | 3 +++ topology/Internet2/Internet2Cincinnati/SITE.yaml | 3 +++ topology/Internet2/Internet2Denver/SITE.yaml | 3 +++ topology/Internet2/Internet2GreatPlains/SITE.yaml | 3 +++ topology/Internet2/Internet2Houston/SITE.yaml | 3 +++ topology/Internet2/Internet2Jacksonville/SITE.yaml | 3 +++ topology/Internet2/Internet2Manhattan/SITE.yaml | 3 +++ topology/Internet2/Internet2Sunnyvale/SITE.yaml | 3 +++ 9 files changed, 27 insertions(+) diff --git a/topology/Internet2/Internet2Boise/SITE.yaml b/topology/Internet2/Internet2Boise/SITE.yaml index 335daa1f4..3f52700b7 100644 --- a/topology/Internet2/Internet2Boise/SITE.yaml +++ b/topology/Internet2/Internet2Boise/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2 Boise Description: Backbone location of Internet2 at the Boise Point of Presence Latitude: 43.6140541897732 Longitude: -116.21071619444785 +City: Boise +State: ID +Country: United States diff --git a/topology/Internet2/Internet2Chicago/SITE.yaml b/topology/Internet2/Internet2Chicago/SITE.yaml index ca76837c6..ebc0fa512 100644 --- a/topology/Internet2/Internet2Chicago/SITE.yaml +++ b/topology/Internet2/Internet2Chicago/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2Chicago Description: Backbone location of Internet2 at the Chicago POP Latitude: 41.8882 Longitude: -87.6164 +City: Chicago +State: IL +Country: United States diff --git a/topology/Internet2/Internet2Cincinnati/SITE.yaml b/topology/Internet2/Internet2Cincinnati/SITE.yaml index e9a2f2a22..79f1699cc 100644 --- a/topology/Internet2/Internet2Cincinnati/SITE.yaml +++ b/topology/Internet2/Internet2Cincinnati/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2 Cincinnati Description: Backbone location of Internet2 at the Cincinnati Point of Presence Latitude: 39.10268252066838 Longitude: -84.50302745925939 +City: Cincinnati +State: OH +Country: United States diff --git a/topology/Internet2/Internet2Denver/SITE.yaml b/topology/Internet2/Internet2Denver/SITE.yaml index 75cfe70e3..57fd9c015 100644 --- a/topology/Internet2/Internet2Denver/SITE.yaml +++ b/topology/Internet2/Internet2Denver/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2 Denver Description: Backbone location of Internet2 at the Denver Point of Presence Latitude: 39.74582707084923 Longitude: -104.97949077328207 +City: Denver +State: CO +Country: United States diff --git a/topology/Internet2/Internet2GreatPlains/SITE.yaml b/topology/Internet2/Internet2GreatPlains/SITE.yaml index f8a4a9944..e317275c2 100644 --- a/topology/Internet2/Internet2GreatPlains/SITE.yaml +++ b/topology/Internet2/Internet2GreatPlains/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2Kansas Description: Backbone location of Internet2 at the GreatPlains POP Latitude: 39.1024 Longitude: -94.5986 +City: Kansas +State: MO +Country: United States diff --git a/topology/Internet2/Internet2Houston/SITE.yaml b/topology/Internet2/Internet2Houston/SITE.yaml index 44f2040fe..6ab86d6e9 100644 --- a/topology/Internet2/Internet2Houston/SITE.yaml +++ b/topology/Internet2/Internet2Houston/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2Houston Description: Backbone location of Internet2 at the Houston POP Latitude: 29.8131 Longitude: -95.3098 +City: Houston +State: TX +Country: United States diff --git a/topology/Internet2/Internet2Jacksonville/SITE.yaml b/topology/Internet2/Internet2Jacksonville/SITE.yaml index 5b499d8d9..b7999b7e9 100644 --- a/topology/Internet2/Internet2Jacksonville/SITE.yaml +++ b/topology/Internet2/Internet2Jacksonville/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2 Jacksonville Description: Backbone location of Internet2 at the Jacksonville Point of Presence Latitude: 30.258591018943438 Longitude: -81.6107849195673 +City: Jacksonville +State: FL +Country: United States diff --git a/topology/Internet2/Internet2Manhattan/SITE.yaml b/topology/Internet2/Internet2Manhattan/SITE.yaml index 8a31af1af..f1aefe05b 100644 --- a/topology/Internet2/Internet2Manhattan/SITE.yaml +++ b/topology/Internet2/Internet2Manhattan/SITE.yaml @@ -3,3 +3,6 @@ LongName: Internet2Manhattan Description: Backbone location of Internet2 at the Manhattan POP Latitude: 40.7145 Longitude: -74.0029 +City: New York +State: NY +Country: United States diff --git a/topology/Internet2/Internet2Sunnyvale/SITE.yaml b/topology/Internet2/Internet2Sunnyvale/SITE.yaml index 3c8c0dcd3..8e0b0fdcb 100644 --- a/topology/Internet2/Internet2Sunnyvale/SITE.yaml +++ b/topology/Internet2/Internet2Sunnyvale/SITE.yaml @@ -3,3 +3,6 @@ LongName: InternetSunnyvale Description: Backbone location of Internet2 at the Sunnyvale POP Latitude: 37.373779 Longitude: -121.987513 +City: Sunnyvale +State: CA +Country: United States From 13b9d1d85b2e575d8b83c5570c626e7e4753a458 Mon Sep 17 00:00:00 2001 From: Josh Willis Date: Thu, 7 Sep 2023 16:21:01 -0500 Subject: [PATCH 176/184] Update CIT_LIGO.yaml for staging origin This creates the entry for the staging server at the CIT LIGO cluster --- .../Caltech LIGO/CIT_LIGO.yaml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml b/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml index 8071ab85d..d1730c239 100644 --- a/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml +++ b/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml @@ -59,6 +59,26 @@ Resources: Description: StashCache Origin server AllowedVOs: - LIGO + CIT_LIGO_ORIGIN_STAGING: + Active: true + Description: This serves proprietary user data staged to and from the CIT cluster + ContactLists: + Administrative Contact: + Primary: + Name: Stuart Anderson + ID: c50e7cc9d0086272ef995fb76461612d40c70435 + Security Contact: + Primary: + Name: Stuart Anderson + ID: c50e7cc9d0086272ef995fb76461612d40c70435 + FQDN: origin-staging.ligo.caltech.edu + DN: /DC=org/DC=incommon/C=US/ST=California/O=California Institute of Technology/CN=origin-staging.ligo.caltech.edu + ID: + Services: + XRootD origin server: + Description: StashCache Origin server + AllowedVOs: + - LIGO CIT_LIGO_SQUID1: ContactLists: Administrative Contact: From 42c24d90350e58d47cec6f8e668e216bfec3b749 Mon Sep 17 00:00:00 2001 From: Josh Willis Date: Thu, 7 Sep 2023 16:32:54 -0500 Subject: [PATCH 177/184] Update LIGO.yaml to add /igwn/cit namespace This namespace will be served by the CIT_LIGO_ORIGIN_STAGING server, and provides OSDF access for user data that is uploaded and downloaded using the osdf file transfer plugin. --- virtual-organizations/LIGO.yaml | 64 ++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 8 deletions(-) diff --git a/virtual-organizations/LIGO.yaml b/virtual-organizations/LIGO.yaml index 49bd8fb72..508bcca40 100644 --- a/virtual-organizations/LIGO.yaml +++ b/virtual-organizations/LIGO.yaml @@ -85,10 +85,10 @@ DataFederations: - FQAN: /virgo/ligo - SciTokens: Issuer: https://cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit - SciTokens: Issuer: https://test.cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit AllowedOrigins: - CIT_LIGO_ORIGIN - LIGO-StashCache-Origin @@ -133,10 +133,10 @@ DataFederations: # But the problem should be solved either by topology (ideally) or the SciTokens XRootD plugin. - SciTokens: Issuer: https://cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit - SciTokens: Issuer: https://test.cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit AllowedOrigins: - UCL-Virgo-StashCache-Origin AllowedCaches: @@ -180,10 +180,10 @@ DataFederations: # But the problem should be solved either by topology (ideally) or the SciTokens XRootD plugin. - SciTokens: Issuer: https://cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit - SciTokens: Issuer: https://test.cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit AllowedOrigins: - CIT_LIGO_ORIGIN_IFO AllowedCaches: @@ -227,10 +227,10 @@ DataFederations: # But the problem should be solved either by topology (ideally) or the SciTokens XRootD plugin. - SciTokens: Issuer: https://cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit - SciTokens: Issuer: https://test.cilogon.org/igwn - Base Path: /user/ligo,/igwn + Base Path: /user/ligo,/igwn,/igwn/cit AllowedOrigins: - CIT_LIGO_ORIGIN_SHARED AllowedCaches: @@ -263,6 +263,54 @@ DataFederations: - CIT_LIGO_STASHCACHE - SINGAPORE_INTERNET2_OSDF_CACHE - SPRACE_OSDF_CACHE + - Path: /igwn/cit + Authorizations: + - FQAN: /osg/ligo + - FQAN: /virgo + - FQAN: /virgo/virgo + - FQAN: /virgo/ligo + # No Scitokens issuers because they are duplicated with the /user/ligo path. + # As long as the caches are kept in sync, this below fix should be fine. + # But the problem should be solved either by topology (ideally) or the SciTokens XRootD plugin. + - SciTokens: + Issuer: https://cilogon.org/igwn + Base Path: /user/ligo,/igwn,/igwn/cit + - SciTokens: + Issuer: https://test.cilogon.org/igwn + Base Path: /user/ligo,/igwn,/igwn/cit + AllowedOrigins: + - CIT_LIGO_ORIGIN_STAGING + AllowedCaches: + - SUT-STASHCACHE + - Georgia_Tech_PACE_GridFTP2 + - Stashcache-UCSD + - Stashcache-UofA + - Stashcache-KISTI + - Stashcache-Houston + - Stashcache-Manhattan + - Stashcache-Sunnyvale + - Stashcache-Chicago + - Stashcache-Kansas + - PIC_STASHCACHE_CACHE + - SU_STASHCACHE_CACHE + - PSU-LIGO-CACHE + - MGHPCC_NRP_OSDF_CACHE + - SDSC_NRP_OSDF_CACHE + - NEBRASKA_NRP_OSDF_CACHE + - CINCINNATI_INTERNET2_OSDF_CACHE + - BOISE_INTERNET2_OSDF_CACHE + - T1_STASHCACHE_CACHE + - CARDIFF_UK_OSDF_CACHE + - ComputeCanada-Cedar-Cache + - JACKSONVILLE_INTERNET2_OSDF_CACHE + - DENVER_INTERNET2_OSDF_CACHE + - AMSTERDAM_ESNET_OSDF_CACHE + - LONDON_ESNET_OSDF_CACHE + - HOUSTON2_INTERNET2_OSDF_CACHE + - CIT_LIGO_STASHCACHE + - SINGAPORE_INTERNET2_OSDF_CACHE + - SPRACE_OSDF_CACHE + Writeback: https://origin-staging.ligo.caltech.edu:1095 - Path: /gwdata Authorizations: - PUBLIC From b7a34bf2fe7d78e72fa473d91189ad24b29e3de7 Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 8 Sep 2023 10:09:35 -0700 Subject: [PATCH 178/184] Fixing city name Fixing city name --- topology/Internet2/Internet2GreatPlains/SITE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Internet2/Internet2GreatPlains/SITE.yaml b/topology/Internet2/Internet2GreatPlains/SITE.yaml index e317275c2..f5675e6fa 100644 --- a/topology/Internet2/Internet2GreatPlains/SITE.yaml +++ b/topology/Internet2/Internet2GreatPlains/SITE.yaml @@ -3,6 +3,6 @@ LongName: Internet2Kansas Description: Backbone location of Internet2 at the GreatPlains POP Latitude: 39.1024 Longitude: -94.5986 -City: Kansas +City: Kansas City State: MO Country: United States From a3f3ed43b5bf2fb3456c2c12c76f00ee8b8778cb Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 8 Sep 2023 10:45:44 -0700 Subject: [PATCH 179/184] Fixing City Fixing City --- topology/Institute of Physics ASCR/FZU/SITE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Institute of Physics ASCR/FZU/SITE.yaml b/topology/Institute of Physics ASCR/FZU/SITE.yaml index be01637a5..0d83adcfc 100644 --- a/topology/Institute of Physics ASCR/FZU/SITE.yaml +++ b/topology/Institute of Physics ASCR/FZU/SITE.yaml @@ -1,5 +1,5 @@ AddressLine1: Na Slovance 1999/2 -City: Prague 8 +City: Prague Country: Czechia Description: Regional Computing Center for Particle Physics (RCCPP) is the biggest site in the Czech Republic for simulations and data processing for particle physics From dffd7f744ee5bb6e65d25f4cf3035569cdbe6ade Mon Sep 17 00:00:00 2001 From: Fabio Andrijauskas Date: Fri, 8 Sep 2023 10:50:53 -0700 Subject: [PATCH 180/184] Fixing Country Fixing Country --- topology/Lehigh University/Lehigh - Hawk/SITE.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/Lehigh University/Lehigh - Hawk/SITE.yaml b/topology/Lehigh University/Lehigh - Hawk/SITE.yaml index 63002cd44..6ec588ed5 100644 --- a/topology/Lehigh University/Lehigh - Hawk/SITE.yaml +++ b/topology/Lehigh University/Lehigh - Hawk/SITE.yaml @@ -4,7 +4,7 @@ ID: 10298 AddressLine1: 8B E. Packer Ave AddressLine2: Room 172 City: Bethlehem -Country: USA +Country: United States State: Pennsylvania Zipcode: "18015" Latitude: 40.609049 From cf336bee27abd6bf0cbbe58d2b6154965e62f68b Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 8 Sep 2023 16:22:53 -0500 Subject: [PATCH 181/184] only auto-generate IDs for resources with no ID, rather than for any falsy value --- src/webapp/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webapp/common.py b/src/webapp/common.py index 8a9c4fb08..c3e3dded0 100644 --- a/src/webapp/common.py +++ b/src/webapp/common.py @@ -291,7 +291,7 @@ def gen_id_from_yaml(data: dict, alternate_name: str, id_key = "ID", mod = 2 ** Given a yaml object, return its existing ID if an ID is present, or generate a new ID for the object based on the md5sum of an alternate string value (usually the key of the object in its parent dictionary) """ - return data.get(id_key) or gen_id(alternate_name, mod, minimum, hashfn) + return data[id_key] if data.get(id_key) is not None else gen_id(alternate_name, mod, minimum, hashfn) def gen_id(instr: AnyStr, mod = 2 ** 31 - 1, minimum=1, hashfn=hashlib.md5) -> int: """ From 46cba2bf00a519cc6383f75bf88728566b61a3d1 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Mon, 11 Sep 2023 09:57:43 -0500 Subject: [PATCH 182/184] Add ID for new CIT_LIGO resource --- .../Caltech LIGO/CIT_LIGO.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml b/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml index d1730c239..95e0266bf 100644 --- a/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml +++ b/topology/California Institute of Technology/Caltech LIGO/CIT_LIGO.yaml @@ -73,7 +73,7 @@ Resources: ID: c50e7cc9d0086272ef995fb76461612d40c70435 FQDN: origin-staging.ligo.caltech.edu DN: /DC=org/DC=incommon/C=US/ST=California/O=California Institute of Technology/CN=origin-staging.ligo.caltech.edu - ID: + ID: 1479 Services: XRootD origin server: Description: StashCache Origin server From b2d85e7ea43fb5f553845e75c5ad9be1650fb43e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 12 Sep 2023 11:20:02 -0500 Subject: [PATCH 183/184] Rename glidein2.chtc.wisc.edu to vo-frontend-glow.chtc.wisc.edu --- 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 25bf06eb4..63084d7a4 100644 --- a/topology/University of Wisconsin/CHTC/CHTC.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC.yaml @@ -14,7 +14,7 @@ Resources: ID: OSG1000015 Name: Aaron Moate Description: This is the GLOW/CHTC glidein frontend. - FQDN: glidein2.chtc.wisc.edu + FQDN: vo-frontend-glow.chtc.wisc.edu ID: 638 Services: Submit Node: From cb9740030c2a73bbc45c9b1f686f3bdf5ab82b17 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 12 Sep 2023 14:14:13 -0500 Subject: [PATCH 184/184] Update CHTC_downtime.yaml --- .../University of Wisconsin/CHTC/CHTC_downtime.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/topology/University of Wisconsin/CHTC/CHTC_downtime.yaml b/topology/University of Wisconsin/CHTC/CHTC_downtime.yaml index 5b4b95522..9f5eb9047 100644 --- a/topology/University of Wisconsin/CHTC/CHTC_downtime.yaml +++ b/topology/University of Wisconsin/CHTC/CHTC_downtime.yaml @@ -42,3 +42,14 @@ Services: - CE # --------------------------------------------------------- +- Class: UNSCHEDULED + ID: 1595460224 + Description: Network issues + Severity: Outage + StartTime: Sep 12, 2023 14:00 +0000 + EndTime: Sep 13, 2023 22:00 +0000 + CreatedTime: Sep 12, 2023 19:13 +0000 + ResourceName: CHTC-glidein2 + Services: + - Submit Node +# ---------------------------------------------------------