From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 30 Apr 2024 19:27:28 +0000 (-0400)
Subject: rgw_cksum: upload->get_info() fails when !cksum (why?)
X-Git-Tag: v20.0.0~1598^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3ff9c63f2de61fb82919d83c1e46bda62d954c2;p=ceph.git

rgw_cksum: upload->get_info() fails when !cksum (why?)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 94a780008faa4..f56a9b347c9a5 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6543,12 +6543,14 @@ void RGWCompleteMultipart::execute(optional_yield y)
   rgw_placement_rule* dest_placement;
   op_ret = upload->get_info(this, s->yield, &dest_placement);
   if (op_ret < 0) {
-    /* XXX this fails inconsistently when !checksum */
+    /* XXX this fails consistently when !checksum */
     ldpp_dout(this, 0) <<
-      "ERROR: MultipartUpload::get_info() for placement failed "
+      "WARNING: MultipartUpload::get_info() for placement failed "
 		       << "ret=" << op_ret << dendl;
-    op_ret =  -ERR_INTERNAL_ERROR;
-    return;
+    if (upload->cksum_type != rgw::cksum::Type::none) {
+      op_ret =  -ERR_INTERNAL_ERROR;
+      return;
+    }
   }
 
   RGWCompressionInfo cs_info;