From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 28 Oct 2014 19:06:25 +0000 (+0100)
Subject: bench_log.cc: catch ceph::FailedAssertion exception
X-Git-Tag: v0.89~22^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04517f0dc2f582a7abc05a2dceface80b98a1fbf;p=ceph.git

bench_log.cc: catch ceph::FailedAssertion exception

Fix for:

CID 717177 (#2-1 of 3): Uncaught exception (UNCAUGHT_EXCEPT)
 root_function: In function main(int, char const **) an exception of
 type ceph::FailedAssertion is thrown and never caught.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
index 425f3986ce6a..774cf553d04d 100644
--- a/src/test/bench_log.cc
+++ b/src/test/bench_log.cc
@@ -53,7 +53,14 @@ int main(int argc, const char **argv)
   for (int i=0; i<threads; i++) {
     T *t = ls.front();
     ls.pop_front();
-    t->join();
+    try {
+      t->join();
+    }
+    catch (ceph::FailedAssertion &a) {
+      cout << "Failed assert in join(), exit." << std::endl;
+      delete t;
+      return -1;
+    }
     delete t;    
   }