Merge pull request ceph#59737 from Suyashd999/fix-tkm1

yuvalif · web-flow · commit 9bc0f196af7c · 2024-09-22T20:56:55.000+03:00
rgw_log_backing: error code not returned 

Reviewed-By: Adam Emerson &lt;aemerson@ibm.com&gt;, Yuval Lifshitz &lt;ylifshit@ibm.com&gt;
diff --git a/src/rgw/driver/rados/rgw_log_backing.cc b/src/rgw/driver/rados/rgw_log_backing.cc
@@ -273,7 +273,7 @@ bs::error_code logback_generations::setup(const DoutPrefixProvider *dpp,
 	ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__ << ":" << __LINE__
 		   << ": failed writing oid=" << oid
 		   << ", r=" << r << dendl;
-	bs::system_error(-r, bs::system_category());
+      return bs::error_code(-r, bs::system_category());
       }
       // Did someone race us? Then re-read.
       if (r != 0) {

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ bs::error_code logback_generations::setup(const DoutPrefixProvider *dpp,`
`273`	`273`	`ldpp_dout(dpp, -1) << __PRETTY_FUNCTION__ << ":" << __LINE__`
`274`	`274`	`<< ": failed writing oid=" << oid`
`275`	`275`	`<< ", r=" << r << dendl;`
`276`		`- bs::system_error(-r, bs::system_category());`
	`276`	`+ return bs::error_code(-r, bs::system_category());`
`277`	`277`	`}`
`278`	`278`	`// Did someone race us? Then re-read.`
`279`	`279`	`if (r != 0) {`