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.

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

[8.0] Correctly collect platform list from queues #7394

Merged
merged 1 commit into from
Jan 16, 2024

Conversation

sfayer
Copy link
Member

@sfayer sfayer commented Jan 15, 2024

Hi,

I think the platform matching logic in the 8.0 site director isn't quite right: The self.platforms list is initialised in the queue loop, so it only ever gets set to the platform of the last queue considered. This patch moves it out of the loop so that all of the platforms for all queues supporting the VO are collected.

(Please can you add a no sweep label to this: I think the 9.0 sitedirector has had all of the platform code removed?)

Regards,
Simon

BEGINRELEASENOTES
*WorkloadManagementSystem
FIX: Correctly collect platform list from queues
ENDRELEASENOTES

@DIRACGridBot DIRACGridBot added the alsoTargeting:integration Cherry pick this PR to integration after merge label Jan 15, 2024
Copy link
Contributor

@aldbr aldbr left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@fstagni fstagni merged commit f47c2b9 into DIRACGrid:rel-v8r0 Jan 16, 2024
25 checks passed
@DIRACGridBot DIRACGridBot added sweep:done All sweeping actions have been done for this PR sweep:failed Sweeping failed and needs manual intervention labels Jan 16, 2024
@DIRACGridBot
Copy link

Sweep summary

Sweep ran in https://github.com/DIRACGrid/DIRAC/actions/runs/7539781918

Failed:

  • integration
    cherry-pick f47c2b9 into integration failed
    check merge conflicts on a local copy of this repository
    git fetch upstream
    git checkout upstream/integration -b cherry-pick-2-f47c2b969-integration
    git cherry-pick -x -m 1 f47c2b969
    # Fix the conflicts
    git cherry-pick --continue
    git commit --amend -m 'sweep: #7394 Correctly collect platform list from queues' --author='Simon Fayer <sf105@ic.ac.uk>'
    git push -u origin cherry-pick-2-f47c2b969-integration
    
    # If you have the GitHub CLI installed the PR can be made with
    gh pr create \
         --label 'sweep:from rel-v8r0' \
         --base integration \
         --repo DIRACGrid/DIRAC \
         --title '[sweep:integration] Correctly collect platform list from queues' \
         --body 'Sweep #7394 `Correctly collect platform list from queues` to `integration`.
    
    Adding original author @sfayer as watcher.
    
    BEGINRELEASENOTES
    *WorkloadManagementSystem
    FIX: Correctly collect platform list from queues
    ENDRELEASENOTES
    Closes #7395'

@aldbr aldbr added sweep:ignore Prevent sweeping from being ran for this PR and removed alsoTargeting:integration Cherry pick this PR to integration after merge labels Jan 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sweep:done All sweeping actions have been done for this PR sweep:failed Sweeping failed and needs manual intervention sweep:ignore Prevent sweeping from being ran for this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants