Skip to content

[9.0] more WMS refactoring #8278

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

Merged
merged 5 commits into from
Aug 8, 2025

Conversation

fstagni
Copy link
Contributor

@fstagni fstagni commented Aug 6, 2025

closes #8272

@fstagni fstagni requested a review from atsareg as a code owner August 6, 2025 12:40
@fstagni fstagni force-pushed the 90_refactoring_WMS branch 2 times, most recently from 7291fc5 to 03bf6f3 Compare August 6, 2025 15:21
@Robin-Van-de-Merghel
Copy link
Contributor

https://github.com/DIRACGrid/DIRAC/actions/runs/16800399792/job/47580269126?pr=8280

Raised after DIRACGrid/diracx@46d54fe#diff-b98996af9344a5261c4c226a471b99b2487ac28369b2607a3f13b048934f33cf:

class JobParameters(BaseModel, extra="forbid"):

For the test itself, change the parameters:

res = jobStateUpdateClient.setJobParameters(jobID, [("par1", "par1Value"), ("par2", "par2Value")])
# par1 is not found, set a real parameter

@fstagni fstagni force-pushed the 90_refactoring_WMS branch from 03bf6f3 to de6c873 Compare August 7, 2025 10:34
@fstagni
Copy link
Contributor Author

fstagni commented Aug 7, 2025

Thank you @Robin-Van-de-Merghel , I was actually looking into this. I do not think this is fully correct, in the sense that job parameters should probably not have a extra="forbid". But I see that DIRACGrid/diracx#626 already addresses that.

@fstagni fstagni force-pushed the 90_refactoring_WMS branch from de6c873 to 49b4ef0 Compare August 7, 2025 11:41
@aldbr
Copy link
Contributor

aldbr commented Aug 7, 2025

I had to remove the extra=forbid because in lhcbdirac we have additional job parameters and attributes, and this was causing errors in the production instances.
I will check which parameters we use, but may be it would be better to let extra=forbid to know what "metadata" we can use within the code. Then extensions (like LHCb) would potentially need to extend the pydantic models to include their extra parameters. Any opinion?

@fstagni fstagni force-pushed the 90_refactoring_WMS branch 3 times, most recently from b37476e to d483115 Compare August 7, 2025 14:59
@fstagni fstagni force-pushed the 90_refactoring_WMS branch from d483115 to dc1f63e Compare August 7, 2025 16:11
@@ -1,11 +1,10 @@
from DIRAC import S_ERROR, S_OK, gLogger
from DIRAC.StorageManagementSystem.DB.StorageManagementDB import StorageManagementDB
from DIRAC.WorkloadManagementSystem.Client import JobStatus
Copy link
Member

Choose a reason for hiding this comment

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

I think most of src/DIRAC/WorkloadManagementSystem/Client/JobStatus.py should be moved to Utilities and reexported into the old location.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I (re)moved one utilities from there. I do not see the need to move other content.

@fstagni fstagni force-pushed the 90_refactoring_WMS branch from a984c76 to d235a78 Compare August 8, 2025 11:21
@chrisburr chrisburr merged commit 2f37df5 into DIRACGrid:integration Aug 8, 2025
25 checks passed
@DIRACGridBot DIRACGridBot added the sweep:ignore Prevent sweeping from being ran for this PR label Aug 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sweep:ignore Prevent sweeping from being ran for this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] JobManager refactoring creates a bad behaviour with filterJobStateTransition
5 participants