From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 3 Jul 2025 19:12:05 +0000 (-0400)
Subject: rgw/datalog: Stick noexcept on wrappers returning int
X-Git-Tag: v20.1.1~71^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46cb1815f01fd1e10fc9d3c7de30ce18352ac2d7;p=ceph.git

rgw/datalog: Stick noexcept on wrappers returning int

Easier to debug.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit bb93aa3e7bfe61eef3d8d6ac923280c3e3f72d0c)

Conflicts:
	src/rgw/driver/rados/rgw_datalog.cc
	src/rgw/driver/rados/rgw_datalog.h
 - Commit was made against the fix for 71066, whose backport is still
   awaiting merge.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_datalog.cc b/src/rgw/driver/rados/rgw_datalog.cc
index 562ba1bd7ef1..1808ae33ca20 100644
--- a/src/rgw/driver/rados/rgw_datalog.cc
+++ b/src/rgw/driver/rados/rgw_datalog.cc
@@ -440,7 +440,7 @@ int RGWDataChangesLog::start(const DoutPrefixProvider *dpp,
 			     const RGWZone* zone,
 			     const RGWZoneParams& zoneparams,
 			     rgw::sal::RadosStore* store,
-			     bool background_tasks)
+			     bool background_tasks) noexcept
 {
   log_data = zone->log_data;
   rados = &store->get_neorados();
@@ -1012,7 +1012,7 @@ void RGWDataChangesLog::add_entry(const DoutPrefixProvider* dpp,
 int RGWDataChangesLog::add_entry(const DoutPrefixProvider* dpp,
 				 const RGWBucketInfo& bucket_info,
 				 const rgw::bucket_log_layout_generation& gen,
-				 int shard_id, optional_yield y)
+				 int shard_id, optional_yield y) noexcept
 {
   try {
     if (y) {
diff --git a/src/rgw/driver/rados/rgw_datalog.h b/src/rgw/driver/rados/rgw_datalog.h
index 5afca080b462..49193b44f617 100644
--- a/src/rgw/driver/rados/rgw_datalog.h
+++ b/src/rgw/driver/rados/rgw_datalog.h
@@ -442,7 +442,7 @@ public:
 
   int start(const DoutPrefixProvider *dpp, const RGWZone* _zone,
 	    const RGWZoneParams& zoneparams, rgw::sal::RadosStore* store,
-	    bool background_tasks);
+	    bool background_tasks) noexcept;
   asio::awaitable<bool> establish_watch(const DoutPrefixProvider* dpp,
 					std::string_view oid);
   asio::awaitable<void> process_notification(const DoutPrefixProvider* dpp,
@@ -460,7 +460,7 @@ public:
   int add_entry(const DoutPrefixProvider *dpp,
 		const RGWBucketInfo& bucket_info,
 		const rgw::bucket_log_layout_generation& gen,
-		int shard_id, optional_yield y);
+		int shard_id, optional_yield y) noexcept;
   int get_log_shard_id(rgw_bucket& bucket, int shard_id);
   asio::awaitable<std::tuple<std::vector<rgw_data_change_log_entry>,
 			     std::string, bool>>