Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backups: fix race condition in "tape" change event during backup

Browse Source 
Ensure that outer tar/encryptor gets all the data *and EOF* before
signalling inner tar to continue. Previously it could happen that inner
tar begins to write next data chunk, while qvm-backup still holds
previous data chunk open.
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-24 03:28:21 +01:00
parent 3d1b40f25c
commit 005db6a5ab
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/qubesutils.py
View File

@ -1173,6 +1173,8 @@ def backup_do_copy(base_backup_dir, files_to_backup, passphrase, progress_callba
hmac_file.flush() hmac_file.flush()
hmac_file.close() hmac_file.close()
pipe.close()
# Send the HMAC to the backup target # Send the HMAC to the backup target
to_send.put(os.path.relpath(chunkfile, backup_tmpdir)+".hmac") to_send.put(os.path.relpath(chunkfile, backup_tmpdir)+".hmac")
@ -1185,7 +1187,6 @@ def backup_do_copy(base_backup_dir, files_to_backup, passphrase, progress_callba
else: else:
print "Finished tar sparse with error",tar_sparse.poll() print "Finished tar sparse with error",tar_sparse.poll()
pipe.close()
to_send.put("FINISHED") to_send.put("FINISHED")
send_proc.join() send_proc.join()