Skip to content

V9.0 removal fix #8228

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

Merged
fstagni merged 2 commits into from
Jun 17, 2025
Merged

V9.0 removal fix #8228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00d40d5
fix: sanity check in consistency tools
chaen Jun 16, 2025
53205bd
fix: avoid double removal in RemoveFile operation
chaen Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions consistency_check/consistency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ def compare_checksum(
# Make a single DF with both info, and only keep pfn in both
joined = pd.concat([fc_dump, se_dump], axis=1)
joined = joined[joined.index.isin(in_both)]
if joined.empty:
raise ValueError("Could not join properly, is something wrong with the files format ?")

# Filter on non matching checksum
non_matching = joined.loc[joined["fc_cks"] != joined["se_cks"]][["seName", "lfn", "fc_cks", "se_cks"]]
Expand Down
13 changes: 7 additions & 6 deletions src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
# Date: 2013/03/25 07:44:19
########################################################################

""" :mod: RemoveFile
""":mod: RemoveFile

================
================

.. module: RemoveFile
.. module: RemoveFile

:synopsis: removeFile operation handler
:synopsis: removeFile operation handler

.. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
.. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com

removeFile operation handler
removeFile operation handler
"""
# #
# @file RemoveFile.py
Expand Down Expand Up @@ -132,6 +132,7 @@ def __call__(self):
self.rmsMonitoringReporter.addRecord(
self.createRMSRecord("Successful", len(toRemoveDict) - len(bulkRemoval["Value"]))
)
toRemoveDict = bulkRemoval["Value"]

# # 2nd step - single file removal
for lfn, opFile in toRemoveDict.items():
Expand Down
Loading