Merge pull request #25081 from cbodley/wip-37091

rgw: catch exceptions from librados::NObjectIterator

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/tools/rados/rados.cc
index 380c8a7fe88dec2a16bbc2b8c32b5e5f5400ee7f,951b4f0b5e984e27e1b0547adef5cdd15a84f4e3..9f0a8024ed8dd5f5452bd3cc22ac4113b05d0ff5
--- 1/src/tools/rados/rados.cc
--- 2/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@@ -2435,9 -2437,10 +2435,9 @@@ static int rados_tool_common(const std:
          }
        }
        }
-       catch (const std::runtime_error& e) {
+       catch (const std::exception& e) {
        cerr << e.what() << std::endl;
 -      ret = -1;
 -      goto out;
 +      return 1;
        }
      }
      if (formatter) {