patrick/zfs_autobackup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now yields errors and mismatches

Browse Source
This commit is contained in:
Edwin Eefting
2022-02-22 14:47:15 +01:00
parent 3f755fcc69
commit 6a58a294a3
4 changed files with 74 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
zfs_autobackup/BlockHasher.py
View File

@ -9,11 +9,11 @@ class BlockHasher():
Its also possible to only read a certain percentage of blocks to just check a sample.
"""
def __init__(self, count=10000, bs=4096, hash_class=hashlib.sha1):
self.count=count
self.bs=bs
self.hash_class=hash_class
def __init__(self, count=10000, bs=4096, hash_class=hashlib.sha1):
self.count = count
self.bs = bs
self.hash_class = hash_class
def generate(self, fname):
"""Generates checksums
@ -39,25 +39,32 @@ class BlockHasher():
yield (chunk_nr, hash.hexdigest())
def compare(self, fname, generator):
"""reads from generator and compares blocks, raises exception on error"""
"""reads from generator and compares blocks, yields mismatches"""
checked=0
with open(fname, "rb") as f:
for ( chunk_nr, hexdigest ) in generator:
# print ("comparing {} {} {}".format(fname, chunk_nr, hexdigest))
try:
checked = 0
with open(fname, "rb") as f:
for (chunk_nr, hexdigest) in generator:
try:
checked=checked+1
hash = self.hash_class()
f.seek(chunk_nr * self.bs * self.count)
block_nr=0
for block in iter(lambda: f.read(self.bs), b""):
hash.update(block)
block_nr=block_nr+1
if block_nr == self.count:
break
checked = checked + 1
hash = self.hash_class()
f.seek(chunk_nr * self.bs * self.count)
block_nr = 0
for block in iter(lambda: f.read(self.bs), b""):
hash.update(block)
block_nr = block_nr + 1
if block_nr == self.count:
break
if (hash.hexdigest()!=hexdigest):
raise Exception("Block {} mismatched! Hash is {}, but should be {}".format(chunk_nr, hash.hexdigest(), hexdigest))
if block_nr == 0:
yield (chunk_nr, hexdigest, 'EOF')
return checked
elif (hash.hexdigest() != hexdigest):
yield (chunk_nr, hexdigest, hash.hexdigest())
except Exception as e:
yield ( chunk_nr , hexdigest, 'ERROR: '+str(e))
except Exception as e:
yield ( '-', '-', 'ERROR: '+ str(e))

4
zfs_autobackup/TreeHasher.py
View File

@ -53,11 +53,11 @@ class TreeHasher():
for file_name, group_generator in itertools.groupby(generator, lambda x: x[0]):
count=count+1
block_generator=itertools.starmap(filter_file_name, group_generator)
self.block_hasher.compare(file_name, block_generator)
for ( chunk_nr, compare_hexdigest, actual_hexdigest) in self.block_hasher.compare(file_name, block_generator):
yield ( file_name, chunk_nr, compare_hexdigest, actual_hexdigest )
finally:
os.chdir(cwd)
return count