1 files changed, 26 insertions, 11 deletions

diff --git a/src/rgw/driver/rados/rgw_tools.cc b/src/rgw/driver/rados/rgw_tools.cc
index f5cd193d815..bf7a309e864 100644
--- a/src/rgw/driver/rados/rgw_tools.cc
+++ b/src/rgw/driver/rados/rgw_tools.cc
@@ -155,7 +155,7 @@ int rgw_put_system_obj(const DoutPrefixProvider *dpp, RGWSI_SysObj* svc_sysobj,
 int rgw_stat_system_obj(const DoutPrefixProvider *dpp, RGWSI_SysObj* svc_sysobj,
                         const rgw_pool& pool, const std::string& key,
                         RGWObjVersionTracker *objv_tracker,
-			real_time *pmtime, optional_yield y,
+			real_time *pmtime, uint64_t *psize, optional_yield y,
 			std::map<std::string, bufferlist> *pattrs)
 {
   rgw_raw_obj obj(pool, key);
@@ -163,6 +163,7 @@ int rgw_stat_system_obj(const DoutPrefixProvider *dpp, RGWSI_SysObj* svc_sysobj,
   return sysobj.rop()
                .set_attrs(pattrs)
                .set_last_mod(pmtime)
+               .set_obj_size(psize)
                .stat(y, dpp);
 }
 
@@ -185,7 +186,7 @@ int rgw_get_system_obj(RGWSI_SysObj* svc_sysobj, const rgw_pool& pool, const str
             .read(dpp, &bl, y);
 }
 
-int rgw_delete_system_obj(const DoutPrefixProvider *dpp, 
+int rgw_delete_system_obj(const DoutPrefixProvider *dpp,
                           RGWSI_SysObj *sysobj_svc, const rgw_pool& pool, const string& oid,
                           RGWObjVersionTracker *objv_tracker, optional_yield y)
 {
@@ -338,21 +339,35 @@ int rgw_list_pool(const DoutPrefixProvider *dpp,
     ldpp_dout(dpp, 10) << "failed to parse cursor: " << marker << dendl;
     return -EINVAL;
   }
-
-  auto iter = ioctx.nobjects_begin(oc);
+  librados::NObjectIterator iter;
+  try {
+    iter = ioctx.nobjects_begin(oc);
+  } catch (const std::system_error& e) {
+    ldpp_dout(dpp, 1) << "rgw_list_pool: Failed to begin iteration of pool "
+		      << ioctx.get_pool_name() << " with error "
+		      << e.what() << dendl;
+    return ceph::from_error_code(e.code());
+  }
   /// Pool_iterate
   if (iter == ioctx.nobjects_end())
     return -ENOENT;
 
-  for (; oids->size() < max && iter != ioctx.nobjects_end(); ++iter) {
-    string oid = iter->get_oid();
-    ldpp_dout(dpp, 20) << "RGWRados::pool_iterate: got " << oid << dendl;
+  try {
+    for (; oids->size() < max && iter != ioctx.nobjects_end(); ++iter) {
+      string oid = iter->get_oid();
+      ldpp_dout(dpp, 20) << "RGWRados::pool_iterate: got " << oid << dendl;
 
-    // fill it in with initial values; we may correct later
-    if (filter && !filter(oid, oid))
-      continue;
+      // fill it in with initial values; we may correct later
+      if (filter && !filter(oid, oid))
+	continue;
 
-    oids->push_back(oid);
+      oids->push_back(oid);
+    }
+  } catch (const std::system_error& e) {
+    ldpp_dout(dpp, 1) << "rgw_list_pool: Failed iterating pool "
+		      << ioctx.get_pool_name() << " with error "
+		      << e.what() << dendl;
+    return ceph::from_error_code(e.code());
   }
 
   marker = iter.get_cursor().to_str();