From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Thu, 29 Nov 2018 19:17:32 +0000 (-0500)
Subject: Merge pull request #25081 from cbodley/wip-37091
X-Git-Tag: v14.1.0~761
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c4d44d98e428707ecc24e55aa644db946663b9c;p=ceph.git

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>
---

1c4d44d98e428707ecc24e55aa644db946663b9c
diff --cc src/tools/rados/rados.cc
index 380c8a7fe88d,951b4f0b5e98..9f0a8024ed8d
--- a/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) {