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

backups: improve error reporting when something failed in dest VM

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-10 03:20:48 +01:00
parent bcf1a19807
commit eeca3eb697
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/backup.py
View File

@ -349,7 +349,7 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
backup_target = "QUBESRPC qubes.Backup none" backup_target = "QUBESRPC qubes.Backup none"
# If APPVM, STDOUT is a PIPE # If APPVM, STDOUT is a PIPE
vmproc = appvm.run(command = backup_target, passio_popen = True) vmproc = appvm.run(command = backup_target, passio_popen = True, passio_stderr = True)
vmproc.stdin.write(base_backup_dir.\ vmproc.stdin.write(base_backup_dir.\
replace("\r","").replace("\n","")+"\n") replace("\r","").replace("\n","")+"\n")
backup_stdout = vmproc.stdin backup_stdout = vmproc.stdin
@ -492,8 +492,12 @@ def backup_do(base_backup_dir, files_to_backup, passphrase,
if len(run_error) > 0: if len(run_error) > 0:
send_proc.terminate() send_proc.terminate()
raise QubesException("Failed to perform backup: error with "+ \ if run_error == "VM" and vmproc:
run_error) raise QubesException("Failed to write the backup, the VM output:\n" +
vmproc.stderr.read())
else:
raise QubesException("Failed to perform backup: error in "+ \
run_error)
# Send the chunk to the backup target # Send the chunk to the backup target
to_send.put(os.path.relpath(chunkfile, backup_tmpdir)) to_send.put(os.path.relpath(chunkfile, backup_tmpdir))