Update git submodules
* Update swift from branch 'master' to 90419df78594ee08eb047d44d52b4675e33cf378 - Merge "s3api: return 503 if mpu complete gets 409 deleting marker" - s3api: return 503 if mpu complete gets 409 deleting marker During an MPU complete, the s3api first PUTs an SLO manifest and then DELETEs the upload marker in <bucket>+segments. If the proxy's clock is slow relative to the proxy that created the upload marker, the DELETE will fail with a 409. Previously the 409 would be returned to the client, which for some clients (e.g. aws cli) does not trigger a retry. Both the manifest and upload marker would remain, which would cause the upload to continue to be listed as if still "in progress". Worse, since the complete failed, the client might delete the segments, leaving the manifest in place but with no segments. This patch adds a "look-before-you-leap" pre-check on the upload marker timestamp. If the marker is found to be in the future then neither the manifest PUT nor the marker DELETE are attempted, and the client receives a 503 response. If the pre-check passes but somehow the marker DELETE still fails with a 409, the client will now receive a 503 that will hopefully trigger a retry. Closes-Bug: #2045046 Change-Id: Ie2e0cb75425e00cff533014af6b6fafad89bff94
This commit is contained in:
parent
782bc812e1
commit
fabe1be8c5
2
swift
2
swift
|
@ -1 +1 @@
|
|||
Subproject commit 190b8576ef89094a42b0852a91adfe06f7805daa
|
||||
Subproject commit 90419df78594ee08eb047d44d52b4675e33cf378
|
Loading…
Reference in New Issue