Merge pull request #6180 from vespa-engine/arnej/use-log-abort

use LOG_ABORT not just abort()

12 files changed, 31 insertions, 17 deletions

diff --git a/storage/src/tests/bucketdb/judymultimaptest.cpp b/storage/src/tests/bucketdb/judymultimaptest.cpp
index db368ac83b5..43b83b16dec 100644
--- a/storage/src/tests/bucketdb/judymultimaptest.cpp
+++ b/storage/src/tests/bucketdb/judymultimaptest.cpp
@@ -10,6 +10,9 @@
 #include <ostream>
 #include <vector>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".judy_multi_map_test");
+
 namespace storage {
 
 struct JudyMultiMapTest : public CppUnit::TestFixture {
diff --git a/storage/src/tests/bucketdb/lockablemaptest.cpp b/storage/src/tests/bucketdb/lockablemaptest.cpp
index 6f36e0be711..c94121062ec 100644
--- a/storage/src/tests/bucketdb/lockablemaptest.cpp
+++ b/storage/src/tests/bucketdb/lockablemaptest.cpp
@@ -8,6 +8,9 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <boost/operators.hpp>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".lockable_map_test");
+
 namespace storage {
 
 struct LockableMapTest : public CppUnit::TestFixture {
diff --git a/storage/src/vespa/storage/bucketdb/judymultimap.hpp b/storage/src/vespa/storage/bucketdb/judymultimap.hpp
index 06d553d38bc..0d80bcfb28e 100644
--- a/storage/src/vespa/storage/bucketdb/judymultimap.hpp
+++ b/storage/src/vespa/storage/bucketdb/judymultimap.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "judymultimap.h"
+#include <vespa/vespalib/util/hdr_abort.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/array.hpp>
 #include <set>
@@ -150,7 +151,7 @@ JudyMultiMap<T0, T1, T2, T3>::operator[](key_type key)
         case 1: return _values1[getIndex(it.value())];
         case 2: return _values2[getIndex(it.value())];
         case 3: return _values3[getIndex(it.value())];
-        default: assert(false);
+        default: HDR_ABORT("should not be reached");
     }
     return T0(); // Avoid warning of no return
 }
@@ -289,8 +290,7 @@ JudyMultiMap<T0, T1, T2, T3>::ConstIterator::operator*() const
         case 3: return value_type(
             _iterator.key(), _parent->_values3[getIndex(_iterator.value())]);
         default:
-            assert(false);
-            abort();
+            HDR_ABORT("should not be reached");
     }
 }
 
@@ -299,11 +299,12 @@ typename JudyMultiMap<T0, T1, T2, T3>::mapped_type
 JudyMultiMap<T0, T1, T2, T3>::ConstIterator::value() const
 {
     switch (getType(_iterator.value())) {
-        default: assert(false);
         case 0: return _parent->_values0[getIndex(_iterator.value())];
         case 1: return _parent->_values1[getIndex(_iterator.value())];
         case 2: return _parent->_values2[getIndex(_iterator.value())];
         case 3: return _parent->_values3[getIndex(_iterator.value())];
+        default:
+            HDR_ABORT("should not be reached");
     }
 }
 
diff --git a/storage/src/vespa/storage/bucketdb/lockablemap.hpp b/storage/src/vespa/storage/bucketdb/lockablemap.hpp
index f370a792145..6d700cd6049 100644
--- a/storage/src/vespa/storage/bucketdb/lockablemap.hpp
+++ b/storage/src/vespa/storage/bucketdb/lockablemap.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "lockablemap.h"
+#include <vespa/vespalib/util/hdr_abort.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/stllike/hash_set.hpp>
@@ -264,7 +265,8 @@ LockableMap<Map>::handleDecision(key_type& key, mapped_type& val,
                      break;
         case ABORT:  return true;
         case CONTINUE: break;
-        default: assert(false);
+        default:
+            HDR_ABORT("should not be reached");
     }
     return false;
 }
diff --git a/storage/src/vespa/storage/bucketdb/storbucketdb.cpp b/storage/src/vespa/storage/bucketdb/storbucketdb.cpp
index 81d07319358..df9e8e4e5b5 100644
--- a/storage/src/vespa/storage/bucketdb/storbucketdb.cpp
+++ b/storage/src/vespa/storage/bucketdb/storbucketdb.cpp
@@ -3,6 +3,9 @@
 #include "storbucketdb.h"
 #include "judymultimap.hpp"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".storage.bucketdb.stor_bucket_db");
+
 namespace storage {
 namespace bucketdb {
 
diff --git a/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp b/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp
index c158b499ebb..5481559cf5a 100644
--- a/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp
+++ b/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp
@@ -5,6 +5,9 @@
 #include <vespa/storage/distributor/operationstarter.h>
 #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".storage.distributor.maintenance.maintenance_scheduler");
+
 namespace storage::distributor {
 
 MaintenanceScheduler::MaintenanceScheduler(
@@ -83,8 +86,7 @@ MaintenanceScheduler::convertToOperationPriority(MaintenancePriority::Priority p
     case MaintenancePriority::VERY_HIGH:
         return OperationStarter::Priority(0);
     default:
-        assert(false);
-        abort();
+        LOG_ABORT("should not be reached");
     }
 }
 
diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h
index 0fbf3bb9e81..c977ea78f67 100644
--- a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h
+++ b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/vespalib/util/hdr_abort.h>
 #include <vespa/storage/distributor/operations/operation.h>
 #include <vespa/storage/bucketdb/bucketdatabase.h>
 #include <vespa/vespalib/util/sync.h>
@@ -30,7 +31,7 @@ public:
     void onReceive(DistributorMessageSender&, const std::shared_ptr<api::StorageReply>&) override
     {
         // Never called.
-        assert(false);
+        HDR_ABORT("should not be reached");
     }
     void onClose(DistributorMessageSender&) override {}
 
diff --git a/storage/src/vespa/storage/distributor/throttlingoperationstarter.h b/storage/src/vespa/storage/distributor/throttlingoperationstarter.h
index c6e39a083b1..0b6d89e0570 100644
--- a/storage/src/vespa/storage/distributor/throttlingoperationstarter.h
+++ b/storage/src/vespa/storage/distributor/throttlingoperationstarter.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "operationstarter.h"
+#include <vespa/vespalib/util/hdr_abort.h>
 #include <vespa/storage/distributor/operations/operation.h>
 
 namespace storage::distributor {
@@ -49,11 +50,11 @@ class ThrottlingOperationStarter : public OperationStarter
         void onStart(DistributorMessageSender&) override {
             // Should never be called directly on the throttled operation
             // instance, but rather on its wrapped implementation.
-            assert(false);
+            HDR_ABORT("should not be reached");
         }
         void onReceive(DistributorMessageSender&,
                                const std::shared_ptr<api::StorageReply>&) override {
-            assert(false);
+            HDR_ABORT("should not be reached");
         }
     };
 
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/appkiller.cpp b/storage/src/vespa/storage/frameworkimpl/thread/appkiller.cpp
index ba1ce957a0f..f2c5c7cf981 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/appkiller.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/thread/appkiller.cpp
@@ -12,7 +12,7 @@ void RealAppKiller::kill() {
     LOG(info, "Aborting the server to dump core, as we're "
               "most likely deadlocked and want a core file "
               "to view the stack traces.");
-    abort();
+    LOG_ABORT("should not be reached");
 }
 
 } // storage
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 06dfc073f61..a01881b6fbe 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -419,8 +419,7 @@ namespace {
                 return static_cast<const api::RemoveCommand&>(msg).getDocumentId();
                 break;
             default:
-                assert(false);
-                abort();
+                LOG_ABORT("should not be reached");
         }
     }
     uint32_t findCommonBits(document::BucketId a, document::BucketId b) {
@@ -544,7 +543,7 @@ FileStorHandlerImpl::remapMessage(api::StorageMessage& msg, const document::Buck
         } else {
             LOG(debug, "Did not remap %s with bucket %s from bucket %s",
                 cmd.toString().c_str(), cmd.getBucketId().toString().c_str(), source.toString().c_str());
-            assert(false);
+            LOG_ABORT("should not be reached");
         }
         break;
     }
diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
index b4c7d1e3e80..01a84177e43 100644
--- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
+++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.cpp
@@ -40,8 +40,7 @@ namespace {
             case SchedulingOptions::CONTINUE:
                 return "Continuing any existing run";
             default:
-                assert(false);
-                abort();
+                LOG_ABORT("should not be reached");
         }
     }
 }
diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
index a15b1b98d63..370f1c85241 100644
--- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp
+++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
@@ -1211,7 +1211,7 @@ MergeThrottler::handleOutdatedMerges(const api::SetSystemStateCommand& cmd)
         markActiveMergesAsAborted(minimumVersion);
     } catch (std::exception& e) {
         LOG(error, "Received exception during merge aborting: %s", e.what());
-        abort();
+        LOG_ABORT("should not be reached");
     }
 
     // Rendezvous released on scope exit