decade-public/btv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

calculate hashes on-the-fly (major speedup)

Browse source
This commit is contained in:
Martin Sekera 2020-08-29 02:16:50 +02:00
parent cdac2e8ab4
commit 5dda6562a6
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
btv
View file

@ -213,9 +213,10 @@ def serialize(snap, outdir, key, snap_from=None):
return 1 return 1
## serialization (most expensive)
##
with lockfile(LOCKFILE): with lockfile(LOCKFILE):
## serialize each subvolume or subvolume pair
##
for subvolume in snap.subvolumes: for subvolume in snap.subvolumes:
if snap_from: if snap_from:
btrfs_send = 'btrfs send -p "%s" "%s"' %( btrfs_send = 'btrfs send -p "%s" "%s"' %(
@ -227,30 +228,27 @@ def serialize(snap, outdir, key, snap_from=None):
os.path.join(snap.path, subvolume) os.path.join(snap.path, subvolume)
) )
error = os.system('%s | zstd | openssl enc -e -aes-256-cbc -pbkdf2 -salt -pass "file:%s" > "%s.btrfs.zst.aes"' %( error = os.system('%s | zstd | openssl enc -e -aes-256-cbc -pbkdf2 -salt -pass "file:%s" | hash-pipe sha512 "%s.btrfs.zst.aes" "%s/manifest.sha512" > "%s.btrfs.zst.aes"' %(
btrfs_send, btrfs_send,
cfg.get("crypto", "keyfile"), cfg.get("crypto", "keyfile"),
subvolume,
directory,
os.path.join(directory, subvolume) os.path.join(directory, subvolume)
)) ))
if error: if error:
print(" !! failed to serialize %s" %(subvolume)) print(" !! failed to serialize %s" %(subvolume))
return error return error
## calculate checksums and add a self-check executable ## final touches
## FIXME calculate this on the fly, re-reading is expensive ##
previous_wd = os.getcwd()
os.chdir(directory) ## add a self-check executable
os.system('sha512sum "%s" > manifest.sha512' %( with open(os.path.join(directory, "check-integrity.sh"), "w") as f:
'" "'.join("%s.btrfs.zst.aes" %(s) for s in snap.subvolumes) f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n")
)) os.chmod(f.name, 0o555)
with open("check-integrity.sh", "w") as f:
f.write("#! /bin/sh\n\nsha512sum --check manifest.sha512\n")
## fix permissions and ownership of created objects ## fix permissions and ownership of created objects
os.chmod("check-integrity.sh", 0o555)
outdir_stat = os.stat(outdir) outdir_stat = os.stat(outdir)
os.chown(directory, outdir_stat.st_uid, outdir_stat.st_gid) os.chown(directory, outdir_stat.st_uid, outdir_stat.st_gid)