catch missing etag

Author: blankdots

swift_upload_runner/download.py

@@ -126,7 +126,13 @@ def download_into_queue(
                 self.content_type = req.headers["Content-Type"]
             except KeyError:
                 self.content_type = "binary/octet-stream"
-            self.chksum = req.headers["ETag"]
+            if "ETag" in req.headers:
+                self.chksum = req.headers["ETag"]
+            else:
+                LOGGER.error("ETag missing, maybe segments file empty")
+                raise aiohttp.web.HTTPUnprocessableEntity(
+                    reason="ETag missing, maybe segments file empty"
+                )
             self.mtime = int(float(req.headers["X-Timestamp"]))
             self.size = int(req.headers["Content-Length"])
             for chunk in req.iter_content(chunk_size=self.chunk_size):

swift_upload_runner/replicate.py

@@ -161,7 +161,13 @@ async def a_sync_object_segments(
                 LOGGER.debug(f"Copying segment {segment}")
                 headers["Content-Length"] = str(length)
                 headers["Content-Type"] = resp_g.headers["Content-Type"]
-                headers["ETag"] = resp_g.headers["ETag"]
+                if "ETag" in resp_g.headers:
+                    headers["ETag"] = resp_g.headers["ETag"]
+                else:
+                    LOGGER.error("ETag missing, maybe segments file empty")
+                    raise aiohttp.web.HTTPUnprocessableEntity(
+                        reason="ETag missing, maybe segments file empty"
+                    )
 
                 to_url = common.generate_download_url(
                     self.host,
@@ -236,7 +242,13 @@ async def a_copy_object(
                 LOGGER.debug(f"Copying object {object_name} in full.")
                 headers["Content-Length"] = str(length)
                 headers["Content-Type"] = resp_g.headers["Content-Type"]
-                headers["ETag"] = resp_g.headers["ETag"]
+                if "ETag" in resp_g.headers:
+                    headers["ETag"] = resp_g.headers["ETag"]
+                else:
+                    LOGGER.error("ETag missing, maybe segments file empty")
+                    raise aiohttp.web.HTTPUnprocessableEntity(
+                        reason="ETag missing, maybe segments file empty"
+                    )
                 async with self.client.put(
                         common.generate_download_url(
                             self.host,