Skip to content

Commit d3ff9c6

Browse files
committed
rgw_cksum: upload->get_info() fails when !cksum (why?)
Signed-off-by: Matt Benjamin <[email protected]>
1 parent 0b9bbcb commit d3ff9c6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/rgw/rgw_op.cc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6543,12 +6543,14 @@ void RGWCompleteMultipart::execute(optional_yield y)
65436543
rgw_placement_rule* dest_placement;
65446544
op_ret = upload->get_info(this, s->yield, &dest_placement);
65456545
if (op_ret < 0) {
6546-
/* XXX this fails inconsistently when !checksum */
6546+
/* XXX this fails consistently when !checksum */
65476547
ldpp_dout(this, 0) <<
6548-
"ERROR: MultipartUpload::get_info() for placement failed "
6548+
"WARNING: MultipartUpload::get_info() for placement failed "
65496549
<< "ret=" << op_ret << dendl;
6550-
op_ret = -ERR_INTERNAL_ERROR;
6551-
return;
6550+
if (upload->cksum_type != rgw::cksum::Type::none) {
6551+
op_ret = -ERR_INTERNAL_ERROR;
6552+
return;
6553+
}
65526554
}
65536555

65546556
RGWCompressionInfo cs_info;

0 commit comments

Comments
 (0)