rgw: Make some thread entry-points noexcept

As mentioned above.

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

diff --git a/src/rgw/rgw_amqp.cc b/src/rgw/rgw_amqp.cc
index 78446e88f68e667443406700a2659aafdabb57cf..205482b78ef98ff3e2b493d0629a13f63d59af5b 100644 (file)
--- a/src/rgw/rgw_amqp.cc
+++ b/src/rgw/rgw_amqp.cc
@@ -628,7 +628,7 @@ private:
   // (3) manages deleted connections
   // (4) TODO reconnect on connection errors
   // (5) TODO cleanup timedout callbacks
-  void run() {
+  void run() noexcept {
     amqp_frame_t frame;
     while (!stopped) {
 

diff --git a/src/rgw/rgw_datalog.cc b/src/rgw/rgw_datalog.cc
index b1c377704f4ae4f2113c21c31c0a1514a976dca2..54b501c82cbafbaf70161c71813f09a2a772bccb 100644 (file)
--- a/src/rgw/rgw_datalog.cc
+++ b/src/rgw/rgw_datalog.cc
@@ -860,7 +860,7 @@ RGWDataChangesLog::~RGWDataChangesLog() {
   }
 }
 
-void RGWDataChangesLog::renew_run() {
+void RGWDataChangesLog::renew_run() noexcept {
   for (;;) {
     dout(2) << "RGWDataChangesLog::ChangesRenewThread: start" << dendl;
     int r = renew_entries();

diff --git a/src/rgw/rgw_datalog.h b/src/rgw/rgw_datalog.h
index 5440b3d1e4ba82d8eb2a07d3c0c7b2c5dd741c3b..1e8652409ed1824d2c2b89c301fe25c138b8343e 100644 (file)
--- a/src/rgw/rgw_datalog.h
+++ b/src/rgw/rgw_datalog.h
@@ -201,7 +201,7 @@ class RGWDataChangesLog {
 
   ceph::mutex renew_lock = ceph::make_mutex("ChangesRenewThread::lock");
   ceph::condition_variable renew_cond;
-  void renew_run();
+  void renew_run() noexcept;
   void renew_stop();
   std::thread renew_thread;
 

diff --git a/src/rgw/rgw_kafka.cc b/src/rgw/rgw_kafka.cc
index 1e8af36ba879bfcdc20d5d2ea9214c37acdd6dd0..55960971144bfbc5c5f969465613b911c8c28e37 100644 (file)
--- a/src/rgw/rgw_kafka.cc
+++ b/src/rgw/rgw_kafka.cc
@@ -396,7 +396,7 @@ private:
   // (3) manages deleted connections
   // (4) TODO reconnect on connection errors
   // (5) TODO cleanup timedout callbacks
-  void run() {
+  void run() noexcept {
     while (!stopped) {
 
       // publish all messages in the queue

diff --git a/src/rgw/rgw_period_pusher.cc b/src/rgw/rgw_period_pusher.cc
index 0eb394ed9c7ad37ed56845202ae1117528b15b18..66511bbcaeda3587cb210286d5ca62ee81a2edfb 100644 (file)
--- a/src/rgw/rgw_period_pusher.cc
+++ b/src/rgw/rgw_period_pusher.cc
@@ -145,7 +145,7 @@ class RGWPeriodPusher::CRThread {
   {
     http.start();
     // must spawn the CR thread after start
-    thread = std::thread([this] { coroutines.run(push_all.get()); });
+    thread = std::thread([this]() noexcept { coroutines.run(push_all.get()); });
   }
   ~CRThread()
   {