diff options
| author | Richard Jones <rjones@redhat.com> | 2010-05-12 19:55:06 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-05-13 17:08:02 +0100 |
| commit | dc706a639eec16084c0618baf7bfde00c6565f63 (patch) | |
| tree | e96751894fe49bf81e704436fc089a173b0f44fc /src | |
| parent | 11a2ad8c9a1da7fe7f8142be69312d0cb5979e0a (diff) | |
| download | libguestfs-dc706a639eec16084c0618baf7bfde00c6565f63.tar.gz libguestfs-dc706a639eec16084c0618baf7bfde00c6565f63.tar.xz libguestfs-dc706a639eec16084c0618baf7bfde00c6565f63.zip | |
Fix FileIn cmds losing synch if both ends send cancel messages (RHBZ#576879).
During a FileIn command (eg. upload, tar-in) if both sides
experience errors, then both sides could send cancel messages,
the result being lost synchronization.
The reason for the lost synch was because the daemon was ignoring
this case and sending an error message back which the library side
(which had cancelled) was not expecting.
Fix this by checking in the daemon for the case where the library
also cancels during daemon cancellation, and not sending an error
messages.
This also includes an enhanced regression test which checks for this
case.
This extends the original fix in
commit 5922d7084d6b43f0a1a15b664c7082dfeaf584d0.
More details can be found here:
https://bugzilla.redhat.com/show_bug.cgi?id=576879#c5
Diffstat (limited to 'src')
| -rwxr-xr-x | src/generator.ml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/generator.ml b/src/generator.ml index a995b4c9..73ab8fa1 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -6198,8 +6198,8 @@ and generate_daemon_actions () = pr "\n"; pr " if (!xdr_guestfs_%s_args (xdr_in, &args)) {\n" name; if is_filein then - pr " cancel_receive ();\n"; - pr " reply_with_error (\"daemon failed to decode procedure arguments\");\n"; + pr " if (cancel_receive () != -2)\n"; + pr " reply_with_error (\"daemon failed to decode procedure arguments\");\n"; pr " goto done;\n"; pr " }\n"; let pr_args n = @@ -6210,8 +6210,8 @@ and generate_daemon_actions () = pr " sizeof (char *) * (args.%s.%s_len+1));\n" n n; pr " if (%s == NULL) {\n" n; if is_filein then - pr " cancel_receive ();\n"; - pr " reply_with_perror (\"realloc\");\n"; + pr " if (cancel_receive () != -2)\n"; + pr " reply_with_perror (\"realloc\");\n"; pr " goto done;\n"; pr " }\n"; pr " %s[args.%s.%s_len] = NULL;\n" n n n; @@ -6222,15 +6222,15 @@ and generate_daemon_actions () = | Pathname n -> pr_args n; pr " ABS_PATH (%s, %s, goto done);\n" - n (if is_filein then "cancel_receive ()" else ""); + n (if is_filein then "cancel_receive ()" else "0"); | Device n -> pr_args n; pr " RESOLVE_DEVICE (%s, %s, goto done);\n" - n (if is_filein then "cancel_receive ()" else ""); + n (if is_filein then "cancel_receive ()" else "0"); | Dev_or_Path n -> pr_args n; pr " REQUIRE_ROOT_OR_RESOLVE_DEVICE (%s, %s, goto done);\n" - n (if is_filein then "cancel_receive ()" else ""); + n (if is_filein then "cancel_receive ()" else "0"); | String n -> pr_args n | OptString n -> pr " %s = args.%s ? *args.%s : NULL;\n" n n n | StringList n -> @@ -6241,7 +6241,7 @@ and generate_daemon_actions () = pr " * and perform device name translation. */\n"; pr " { int pvi; for (pvi = 0; physvols[pvi] != NULL; ++pvi)\n"; pr " RESOLVE_DEVICE (physvols[pvi], %s, goto done);\n" - (if is_filein then "cancel_receive ()" else ""); + (if is_filein then "cancel_receive ()" else "0"); pr " }\n"; | Bool n -> pr " %s = args.%s;\n" n n | Int n -> pr " %s = args.%s;\n" n n @@ -6257,7 +6257,7 @@ and generate_daemon_actions () = (* Emit NEED_ROOT just once, even when there are two or more Pathname args *) pr " NEED_ROOT (%s, goto done);\n" - (if is_filein then "cancel_receive ()" else ""); + (if is_filein then "cancel_receive ()" else "0"); ); (* Don't want to call the impl with any FileIn or FileOut |