Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- VBOX: Do not treat the timeout error as a fatal error when attempting 

to delete stale snapshots.  Slower machines can take longer than
        45 seconds to complete the deletion of old snapshots.

    samples/vboxwrapper/
        vbox.cpp

svn path=/trunk/boinc/; revision=25474
This commit is contained in:
Rom Walton 2012-03-22 19:00:37 +00:00
parent fc818a027f
commit d2155c4488
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -2954,3 +2954,11 @@ Rom 22 Mar 2012
samples/vboxwrapper/
vbox.cpp
vboxwrapper.cpp
Rom 22 Mar 2012
- VBOX: Do not treat the timeout error as a fatal error when attempting
to delete stale snapshots. Slower machines can take longer than
45 seconds to complete the deletion of old snapshots.
samples/vboxwrapper/
vbox.cpp

15
samples/vboxwrapper/vbox.cpp
View File

@ -420,8 +420,10 @@ int VBOX_VM::createsnapshot(double elapsed_time, double checkpoint_cpu_time) {
command = "snapshot \"" + vm_name + "\" ";
command += "delete boinc_";
command += buf;
retval = vbm_popen(command, output, "delete stale snapshot");
if (retval) return retval;
retval = vbm_popen(command, output, "delete stale snapshot", true, false);
if (retval) {
if (retval != ERR_TIMEOUT) return retval;
}
}
fprintf(
@ -1663,13 +1665,9 @@ int VBOX_VM::vbm_popen_raw(string& arguments, string& output) {
// Timeout?
if (ulExitTimeout >= 45000) {
fprintf(
stderr,
"%s Process Timeout!.\n",
vboxwrapper_msg_prefix(buf, sizeof(buf))
);
TerminateProcess(pi.hProcess, EXIT_FAILURE);
ulExitCode = 0;
retval = ERR_TIMEOUT;
Sleep(1000);
}
@ -1697,6 +1695,7 @@ CLEANUP:
// If something couldn't be found, just return ERR_FOPEN
if (!retval) retval = ERR_FOPEN;
}
#else