Merge pull request ceph#61406 from clwluvw/checkpoint-dstbucket

ivancich · web-flow · commit 3b96a09094c0 · 2025-01-17T13:14:42.000-05:00
rgw: set dest bucket id in bucket sync checkpoint

Reviewed-by: Shilpa Jagannath &lt;smanjara@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_rest_log.cc b/src/rgw/driver/rados/rgw_rest_log.cc
@@ -1061,7 +1061,7 @@ void RGWOp_BILog_Status::execute(optional_yield y)
 
     if (!pipe.dest.bucket) {
       /* Uh oh, something went wrong */
-      ldpp_dout(this, 20) << "ERROR: RGWOp_BILog_Status::execute(optional_yield y): BUG: pipe.dest.bucket was not initialized" << pipe << dendl;
+      ldpp_dout(this, 0) << "ERROR: RGWOp_BILog_Status::execute(optional_yield y): BUG: pipe.dest.bucket was not initialized" << pipe << dendl;
       op_ret = -EIO;
       return;
     }
diff --git a/src/rgw/radosgw-admin/sync_checkpoint.cc b/src/rgw/radosgw-admin/sync_checkpoint.cc
@@ -228,6 +228,7 @@ int rgw_bucket_sync_checkpoint(const DoutPrefixProvider* dpp,
     }
     auto& entry = sources.emplace_back();
     entry.pipe = pipe;
+    entry.pipe.dest.bucket = info.bucket; // so it contains the bucket key (+bucket id)
 
     // fetch remote markers
     boost::asio::spawn(ioctx, [&] (boost::asio::yield_context yield) {

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ void RGWOp_BILog_Status::execute(optional_yield y)`
`1061`	`1061`
`1062`	`1062`	`if (!pipe.dest.bucket) {`
`1063`	`1063`	`/* Uh oh, something went wrong */`
`1064`		`- ldpp_dout(this, 20) << "ERROR: RGWOp_BILog_Status::execute(optional_yield y): BUG: pipe.dest.bucket was not initialized" << pipe << dendl;`
	`1064`	`+ ldpp_dout(this, 0) << "ERROR: RGWOp_BILog_Status::execute(optional_yield y): BUG: pipe.dest.bucket was not initialized" << pipe << dendl;`
`1065`	`1065`	`op_ret = -EIO;`
`1066`	`1066`	`return;`
`1067`	`1067`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,7 @@ int rgw_bucket_sync_checkpoint(const DoutPrefixProvider* dpp,`
`228`	`228`	`}`
`229`	`229`	`auto& entry = sources.emplace_back();`
`230`	`230`	`entry.pipe = pipe;`
	`231`	`+ entry.pipe.dest.bucket = info.bucket; // so it contains the bucket key (+bucket id)`
`231`	`232`
`232`	`233`	`// fetch remote markers`
`233`	`234`	`boost::asio::spawn(ioctx, [&] (boost::asio::yield_context yield) {`