Commit 82d21446 authored by Łukasz Nowak's avatar Łukasz Nowak

software/kvm: Use backup-signature tool

Thanks to this tool allowing incremental checksum calculation increase of
backup size does not result with increase of backup time spend on checksum
calculation.
parent d958bf42
......@@ -15,7 +15,7 @@
[template]
filename = instance.cfg.in
md5sum = 2ef12d7fc16d74e0887a8cb16a848445
md5sum = 09552cbd0da123f018ddd0fcd75f3507
[template-kvm]
filename = instance-kvm.cfg.jinja2
......@@ -31,19 +31,19 @@ md5sum = 12d46a7d45f00e091d18e6d4552d0973
[template-kvm-import]
filename = instance-kvm-import.cfg.jinja2.in
md5sum = 0829d08337a09b8ef017e71fbb9384fb
md5sum = e39ebf2a6db9ea7187df8cebcb87711a
[template-kvm-import-script]
filename = template/kvm-import.sh.jinja2
md5sum = a6e6abb3b17fae37b84233d63014b885
md5sum = 21a620fafd8b76d4e915e359c69ae553
[template-kvm-export]
filename = instance-kvm-export.cfg.jinja2
md5sum = a02f0694dcb944c18d99f7f79afa2384
md5sum = 72f1f334e3b9f8de0f65373b4cd6e6d6
[template-kvm-export-script]
filename = template/kvm-export.sh.jinja2
md5sum = 667e4668cfdf396d18785d8cfa096396
md5sum = e07fb8561c9aed4919c656c2d192e02b
[template-nginx]
filename = template/nginx_conf.in
......
......@@ -43,6 +43,7 @@ context =
key socket_path kvm-instance:socket-path
section disk disk
raw qmpbackup {{ qmpbackup }}
raw backup_signature {{ backup_signature }}
# Extends publish section with resilient parameters
[publish-connection-information]
......
......@@ -67,6 +67,7 @@ wrapper = ${:output}
context =
section directory directory
raw qmprestore {{ qmprestore }}
raw backup_signature {{ backup_signature }}
[kvm-disk-image-corruption-bin]
recipe = collective.recipe.template
......
......@@ -146,6 +146,7 @@ context =
key slapparameter_dict slap-configuration:configuration
key qmpbackup qmpbackup-binary:wrapper-path
raw check_backup_directory ${check-backup-directory.sh:output}
raw backup_signature ${buildout:bin-directory}/backup-signature
[qmprestore-binary]
recipe = slapos.cookbook:wrapper
......@@ -170,3 +171,4 @@ context =
key pbsready_import_template template-pbsready-import:output
key slapparameter_dict slap-configuration:configuration
key qmprestore qmprestore-binary:wrapper-path
raw backup_signature ${buildout:bin-directory}/backup-signature
......@@ -47,4 +47,4 @@ if [ x"$recent_full" != x"" ] ; then
done
fi
cd $BACKUP_DIR && find -type f ! -name backup.signature -print0 | xargs -0 sha256sum | LC_ALL=C sort -k 66 > backup.signature
{{ backup_signature }} --action update --directory $BACKUP_DIR --signature-file-name backup.signature
......@@ -10,7 +10,7 @@ umask 077
write_backup_proof () {
cd {{ directory['backup'] }}
find -type f ! -name backup.signature ! -wholename "./rdiff-backup-data/*" -print0 | xargs -0 sha256sum | LC_ALL=C sort -k 66 > {{ directory['srv'] }}/proof.signature
{{ backup_signature }} --action update --directory {{ directory['backup'] }} --signature-file-name backup.signature --proof-signature-path {{ directory['srv'] }}/proof.signature
diff -ruw {{ directory['backup'] }}/backup.signature {{ directory['srv'] }}/proof.signature > {{ directory['srv'] }}/backup.diff
}
......
......@@ -368,7 +368,7 @@ slapos.rebootstrap = 4.7
slapos.recipe.build = 0.58
slapos.recipe.cmmi = 0.22
slapos.recipe.template = 5.1
slapos.toolbox = 0.147
slapos.toolbox = 0.149
smmap = 5.0.0
sniffio = 1.3.0
sortedcontainers = 2.4.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment