[ostree] pull: Handle remote web server not honoring range requests
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] pull: Handle remote web server not honoring range requests
- Date: Mon, 6 Apr 2015 18:33:34 +0000 (UTC)
commit 115e05746beac7b52f8515e34b339d65e105b5e0
Author: Colin Walters <walters verbum org>
Date: Sat Apr 4 10:49:28 2015 -0400
pull: Handle remote web server not honoring range requests
It's valid for the remote server to say 200 OK and give us the entire
file instead of a 206 Partial Content, and in that case we should blow
away the previous cached data, rather than blindly appending to it and
thus creating multiple copies of the data inside the file.
This problem primarily occurs when we do have the complete file, and
we're interrupted, then try again, where the new process didn't record
the download was already complete. We do a range request for bytes
past the end, and some web servers (e.g. Akamai) will return 200 OK
with the whole content again, rather than a 416 Requested Range Not
Satisfiable.
Thus we could also fix this by saner caching strategy - since we know
the file is complete, rename it again to $checksum.done or something
before it's processed. (Or really, rework how we do caching more
intelligently in general).
This fixes the issue that interrupted pulls failed with such
webservers, although repeated attempts would eventually succeed
because we'd unlink files that failed to pull.
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1207292
src/libostree/ostree-fetcher.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c
index 53e5b72..2aa4178 100644
--- a/src/libostree/ostree-fetcher.c
+++ b/src/libostree/ostree-fetcher.c
@@ -492,7 +492,18 @@ on_request_sent (GObject *object,
if (!pending->is_stream)
{
- int fd = openat (pending->self->tmpdir_dfd, pending->out_tmpfile, O_CREAT | O_WRONLY | O_APPEND |
O_CLOEXEC, 0600);
+ int oflags = O_CREAT | O_WRONLY | O_CLOEXEC;
+ int fd;
+
+ /* If we got partial content, we can append; if the server
+ * ignored our range request, we need to truncate.
+ */
+ if (msg && msg->status_code == SOUP_STATUS_PARTIAL_CONTENT)
+ oflags |= O_APPEND;
+ else
+ oflags |= O_TRUNC;
+
+ fd = openat (pending->self->tmpdir_dfd, pending->out_tmpfile, oflags, 0600);
if (fd == -1)
{
gs_set_error_from_errno (&local_error, errno);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]