From f61ba51171ef58c8caaffdfbfba4f27efa564c7c Mon Sep 17 00:00:00 2001 From: OpenShift Cherrypick Robot Date: Mon, 28 Nov 2022 18:24:02 +0000 Subject: [PATCH] Revert "chore: Add server side assembly of chunked metadata for RADOSGW driver (PROJQUAY-4592) (#1557)" (#1647) This reverts commit cdb52ed023c8222f2eeb95a1c71c403a06655ed8. Noobaa has issues assembling big blobs from keys so this needs to be reverted and more testing is required. Co-authored-by: Ivan Bazulic --- storage/cloud.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/storage/cloud.py b/storage/cloud.py index a5c01d1e0..8bd9818ca 100644 --- a/storage/cloud.py +++ b/storage/cloud.py @@ -965,6 +965,15 @@ class RadosGWStorage(_CloudStorage): return super(RadosGWStorage, self).get_direct_upload_url(path, mime_type, requires_cors) + def complete_chunked_upload(self, uuid, final_path, storage_metadata): + self._initialize_cloud_conn() + + # RadosGW does not support multipart copying from keys, so we are forced to join + # it all locally and then reupload. + # See https://github.com/ceph/ceph/pull/5139 + chunk_list = self._chunk_list_from_metadata(storage_metadata) + self._client_side_chunk_join(final_path, chunk_list) + class RHOCSStorage(RadosGWStorage): """