From ce2fb31a721ae1a9e9805a145d2d74d8664d047c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 13 Sep 2021 13:08:02 +1000 Subject: [PATCH] Fix range response The range starts from zero, so we are returning one byte too many. Docker echos this back to us in the manifest it uploads which is where the extra byte is coming from. This is actually the root cause of the off-by-one error worked around in 134c9428353247c22b69f497b904593faf93292d. A follow-on will clean this up (Ibe061171bfd8ab6043b491bbab933bf277f8e12b). Change-Id: I1fb1abf3c76ea8db7820caa90c97ddbf92997842 --- zuul_registry/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zuul_registry/main.py b/zuul_registry/main.py index 7835592..ccb324d 100644 --- a/zuul_registry/main.py +++ b/zuul_registry/main.py @@ -271,7 +271,8 @@ class RegistryAPI: orig_repository, uuid) res.headers['Docker-Upload-UUID'] = uuid res.headers['Content-Length'] = '0' - res.headers['Range'] = '0-%s' % (new_length,) + # Be careful to not be off-by-one, range starts at 0 + res.headers['Range'] = '0-%s' % (new_length - 1,) res.status = '202 Accepted' self.log.info( '[u: %s] Finish Upload chunk %s %s', uuid, repository, new_length)