Expose exception information. If totally unknown, generate core.

3 files changed, 1 insertions, 13 deletions

diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index 483cffaf751..c7d8bf24e82 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -258,10 +258,6 @@ StatusWebServer::handlePage(const framework::HttpUrlPath& urlpath, std::ostream&
                 HttpErrorWriter writer(out, "500 Internal Server Error");
                 writer << "<pre>" << e.what() << "</pre>";
                 pageExisted = true;
-            } catch (...) {
-                HttpErrorWriter writer(out, "500 Internal Server Error");
-                writer << "Unknown exception";
-                pageExisted = true;
             }
             if (pageExisted) {
                 LOG(spam, "Status finished request");
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index 26cfb0e6566..1e9cc7c0cde 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -1361,11 +1361,8 @@ MergeHandler::handleGetBucketDiffReply(api::GetBucketDiffReply& reply,
     } catch (std::exception& e) {
         _env._fileStorHandler.clearMergeStatus(
                 bucket.getBucket(),
-                api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE,
-                                e.what()));
+                api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE, e.what()));
         throw;
-    } catch (...) {
-        assert(false);
     }
 
     if (clearState) {
@@ -1586,8 +1583,6 @@ MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply,
                 api::ReturnCode(api::ReturnCode::INTERNAL_FAILURE,
                                 e.what()));
         throw;
-    } catch (...) {
-        assert(false);
     }
 
     if (clearState) {
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 783bde40981..eee688b1fb2 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -481,9 +481,6 @@ CommunicationManager::process(const std::shared_ptr<api::StorageMessage>& msg)
         LOGBP(error, "When running command %s, caught exception %s. Discarding message",
               msg->toString().c_str(), e.what());
         _metrics.exceptionMessageProcessTime[msg->getLoadType()].addValue(startTime.getElapsedTimeAsDouble());
-    } catch (...) {
-        LOG(fatal, "Caught fatal exception in communication manager");
-        throw;
     }
 }