Skip to content
Snippets Groups Projects
Commit 94752570 authored by Marko Petric's avatar Marko Petric
Browse files

Merge branch 'v10r0_FIX_cksDataIntegrity' into 'master'

[v10r1] DataIntegrity: correct Adler32 comparison

See merge request lhcb-dirac/LHCbDIRAC!979

(cherry picked from commit 5051b2ab)

964eb806 DataIntegrity: correct Adler32 comparison
parent b19751a3
No related branches found
No related tags found
No related merge requests found
......@@ -19,6 +19,7 @@ import re
import six
from DIRAC import S_OK, gLogger
from DIRAC.Core.Utilities.Adler import compareAdler
from DIRAC.Core.Utilities.ReturnValues import returnSingleResult
from DIRAC.Resources.Catalog.FileCatalog import FileCatalog
from DIRAC.Resources.Storage.StorageElement import StorageElement
......@@ -290,8 +291,8 @@ class DataIntegrityClient(DIRACDataIntegrityClient):
if lfn in catalogMetadata:
if (metadata['Size'] != catalogMetadata[lfn]['Size']) and (metadata['Size'] != 0):
sizeMismatch.append((lfn, 'deprecatedUrl', se, 'CatalogPFNSizeMismatch'))
if metadata['Checksum'] != catalogMetadata[lfn]['Checksum']:
if metadata['Checksum'].replace('x', '0') == catalogMetadata[lfn]['Checksum'].replace('x', '0'):
if not compareAdler(metadata['Checksum'], catalogMetadata[lfn]['Checksum']):
if compareAdler(metadata['Checksum'].replace('x', '0'), catalogMetadata[lfn]['Checksum'].replace('x', '0')):
checksumBadInFC.append(
(lfn, 'deprecatedUrl', se, "%s %s" %
(metadata['Checksum'], catalogMetadata[lfn]['Checksum'])))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment