Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

setting facility name DIII-D National Fusion Facility #3957

Closed
wants to merge 23 commits into from
Closed

setting facility name DIII-D National Fusion Facility #3957

wants to merge 23 commits into from

Conversation

biozit
Copy link
Contributor

@biozit biozit commented Jun 7, 2024

No description provided.

@biozit biozit requested a review from williamnswanson June 7, 2024 21:31
williamnswanson
williamnswanson previously approved these changes Jun 7, 2024
View reviewed changes
Copy link
Contributor

@williamnswanson williamnswanson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@williamnswanson williamnswanson self-requested a review June 7, 2024 21:47
@williamnswanson williamnswanson dismissed their stale review June 7, 2024 21:50

Didn't see merge conflicts

@matyasselmeci
Copy link
Collaborator

Fabio, it looks like the original files got updated in master before you did your move. Can you do the following:

Make sure master is up to date:

git checkout master
git pull upstream master

reset this branch to master

git checkout fixing-FDP
git reset --hard master

do the move again

git mv "topology/DIII-D" "topology/DIII-D National Fusion Facility"

then push the results

git push --force-with-lease origin fixing-FDP

ChristinaLK and others added 23 commits June 10, 2024 12:17
@ChristinaLK @biozit
Create UWMadison_OConnor.yaml
2ae09ac
@matyasselmeci @biozit
Add InstitutionID
5f62614
@matyasselmeci @biozit
Cache and pre-calculate authfile lines to speed up generation
d7804bc
@matyasselmeci @biozit
Don't cache get_scitokens_conf_block()
c0a1f91 
care must be taken when caching methods (see https://docs.python.org/3/faq/programming.html#how-do-i-cache-method-calls) and it's not called frequently enough to be worth it.
@biozit
Adding FDP origin
9bb40d5 
Adding FDP origin
@biozit
fixing hostname
c7096be
@biozit
fixing yaml
7a16844 
fixing yaml
@matyasselmeci @biozit
Update FDP-OSDF.yaml
7c7205b 
Fix DN and FQDN
@wyang007 @biozit
Update SLAC resource
e4940fe
@matyasselmeci @biozit
Update WT2.yaml
0841ee1 
ID not needed for new resources
@kurtjstrosahl-jlab @biozit
Update JLab-Farm.yaml
9082489 
adding osg-ce-3, which will replace osg-ce-1 in June.
@matyasselmeci @biozit
Update JLab-Farm.yaml
b002c85 
ID not needed for new resources
@brianhlin @biozit
Retire /ospool/PROTECTED (INF-1883)
af1db46
@brianhlin @biozit
Also retire the ITB S3 origins
16d4927
@matyasselmeci @biozit
Cache and measure the update of the Topology Git repo separately
d5e2d2f 
instead of having the vo data, projects data, mappings data, and resourcegroup data
all pulling from the git repo when they get updated.

While I'm at it, use time.monotonic() instead of time.time() for the cache time
(which avoids issues if we run, say, ntpdate).
@matyasselmeci @biozit
Fix return type of maybe_update_topology_repo()
2d2c69e
@matyasselmeci @biozit
Add some more debug logging to updates
5e00d50
@matyasselmeci @biozit
Drop Python 3.2 compatibility shim
24cfb89
@biozit
Adding MI cache
d01e303 
Adding MI cache
@biozit
adding details to the Site and src
81607b2 
adding details to the Site and src
@matyasselmeci @biozit
Update Missouri-Rise.yaml
7686b09
@biozit
setting facility name DIII-D National Fusion Facility
96fb193
@biozit
fixing FDP institution name
3bd90f4 
fixing FDP institution name
@biozit
Copy link
Contributor Author

biozit commented Jun 10, 2024

I will create another PR to fix this

@biozit biozit closed this Jun 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamnswanson williamnswanson Awaiting requested review from williamnswanson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@biozit @matyasselmeci @williamnswanson @ChristinaLK @wyang007 @kurtjstrosahl-jlab @brianhlin