*, do not rely on always-false ceph_asserts to terminate execution

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/common/perf_histogram.cc b/src/common/perf_histogram.cc
index 13528764ade9ff77ea8728c1cfdd2baad589cc74..772cc5e2cdc3a8d79c92fad434b6dc3575ca67af 100644 (file)
--- a/src/common/perf_histogram.cc
+++ b/src/common/perf_histogram.cc
@@ -33,7 +33,7 @@ void PerfHistogramCommon::dump_formatted_axis(
       f->dump_string("scale_type", "log2");
       break;
     default:
-      ceph_assert(false && "Invalid scale type");
+      ceph_abort_msg("Invalid scale type");
   }
 
   {
@@ -63,7 +63,7 @@ int64_t get_quants(int64_t i, PerfHistogramCommon::scale_type_d st) {
     case PerfHistogramCommon::SCALE_LOG2:
       return int64_t(1) << (i - 1);
   }
-  ceph_assert(false && "Invalid scale type");
+  ceph_abort_msg("Invalid scale type");
 }
 
 int64_t PerfHistogramCommon::get_bucket_for_axis(
@@ -87,7 +87,7 @@ int64_t PerfHistogramCommon::get_bucket_for_axis(
       }
       return ac.m_buckets - 1;
   }
-  ceph_assert(false && "Invalid scale type");
+  ceph_abort_msg("Invalid scale type");
 }
 
 std::vector<std::pair<int64_t, int64_t>>

diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc
index db6decd84f94aaa473134c3c67a72ba2f2446854..c44abe46ae95654af6cf97ab74b6612265837c61 100644 (file)
--- a/src/crimson/os/alienstore/alien_store.cc
+++ b/src/crimson/os/alienstore/alien_store.cc
@@ -638,7 +638,7 @@ auto AlienStore::omap_get_header(CollectionRef ch,
         return crimson::ct_error::enoent::make();
       } else if (r < 0) {
         logger().error("omap_get_header: {}", r);
-        ceph_assert(0 == "impossible");
+        ceph_abort_msg("impossible");
       } else {
         return get_attr_errorator::make_ready_future<ceph::bufferlist>(
          std::move(bl));

diff --git a/src/crimson/osd/scheduler/mclock_scheduler.cc b/src/crimson/osd/scheduler/mclock_scheduler.cc
index 2fcf6d57db47fb01e39534bfb74e1a2165fe66dd..3de2327f59c01feb15e710a8cca3b93e6044258a 100644 (file)
--- a/src/crimson/osd/scheduler/mclock_scheduler.cc
+++ b/src/crimson/osd/scheduler/mclock_scheduler.cc
@@ -123,12 +123,12 @@ item_t mClockScheduler::dequeue()
   } else {
     mclock_queue_t::PullReq result = scheduler.pull_request();
     if (result.is_future()) {
-      ceph_assert(
-       0 == "Not implemented, user would have to be able to be woken up");
+      ceph_abort_msg(
+       "Not implemented, user would have to be able to be woken up");
       return std::move(*(item_t*)nullptr);
     } else if (result.is_none()) {
-      ceph_assert(
-       0 == "Impossible, must have checked empty() first");
+      ceph_abort_msg(
+       "Impossible, must have checked empty() first");
       return std::move(*(item_t*)nullptr);
     } else {
       ceph_assert(result.is_retn());

diff --git a/src/librbd/crypto/CryptoContextPool.h b/src/librbd/crypto/CryptoContextPool.h
index 00486dacdd6591922ae97bce5045b29955424cf7..9b6a9898b8cbbd52372aef7903a6d5f612df3230 100644 (file)
--- a/src/librbd/crypto/CryptoContextPool.h
+++ b/src/librbd/crypto/CryptoContextPool.h
@@ -57,7 +57,7 @@ private:
         case CIPHER_MODE_DEC:
           return m_decrypt_contexts;
         default:
-          ceph_assert(false);
+          ceph_abort();
       }
     }
 };

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c0454e2689e37fbc10d551e101aede0cc6f04995..4ad4dab72c39607a695ef2c953d3f04d68d9a1d8 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4156,10 +4156,10 @@ struct AnonConnection : public Connection {
   entity_addr_t socket_addr;
 
   int send_message(Message *m) override {
-    ceph_assert(!"send_message on anonymous connection");
+    ceph_abort_msg("send_message on anonymous connection");
   }
   void send_keepalive() override {
-    ceph_assert(!"send_keepalive on anonymous connection");
+    ceph_abort_msg("send_keepalive on anonymous connection");
   }
   void mark_down() override {
     // silently ignore

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 7dca7f49f1e51817c81dd02a9947ca2668bbf210..6de5d1ed41af851053dbf08ff7607130ee0bc0d8 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -10143,7 +10143,7 @@ public:
     }
     /// Check whether there is anything to do.
     bool _empty() override {
-      ceph_assert(false);
+      ceph_abort();
     }
 
     /// Get the next work item to process.
@@ -10210,7 +10210,7 @@ public:
      * so at most one copy will execute simultaneously for a given thread pool.
      * It can be used for non-thread-safe finalization. */
     void _void_process_finish(void*) override {
-      ceph_assert(false);
+      ceph_abort();
     }
 
     bool queue(

diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 0d28d2716fc5e169615d04e06fe26c8d6a55d039..18bea62ba4fe052a8641bd80f478c7a7ef0f7de0 100644 (file)
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -998,7 +998,7 @@ public:
       }
       loc -= e.length;
     }
-    ceph_assert(false);
+    ceph_abort();
   };
 
   /// updates blob's pextents container and return unused pextents eligible

diff --git a/src/osd/scheduler/OpScheduler.cc b/src/osd/scheduler/OpScheduler.cc
index 12e5bdb6c45fbfb611d301c4449f4295d292931a..efd4dc3303a92785081c4b85aed217d99e0c5954 100644 (file)
--- a/src/osd/scheduler/OpScheduler.cc
+++ b/src/osd/scheduler/OpScheduler.cc
@@ -43,7 +43,7 @@ OpSchedulerRef make_scheduler(
       mClockScheduler>(cct, whoami, num_shards, shard_id, is_rotational,
         op_queue_cut_off, monc);
   } else {
-    ceph_assert("Invalid choice of wq" == 0);
+    ceph_abort_msg("Invalid choice of wq");
   }
 }
 

diff --git a/src/test/crimson/seastore/test_extent_allocator.cc b/src/test/crimson/seastore/test_extent_allocator.cc
index 87a5d0feb584af69bb1794044168093e7c4a0d0d..ece78e5c1d6d52e0b19b5a035bc94dc480747ed5 100644 (file)
--- a/src/test/crimson/seastore/test_extent_allocator.cc
+++ b/src/test/crimson/seastore/test_extent_allocator.cc
@@ -38,7 +38,7 @@ struct allocator_test_t :
       allocator.reset(new AvlAllocator(false));
       return seastar::now();
     } 
-    ceph_assert(0 == "no support");
+    ceph_abort("no support");
   }
   seastar::future<> tear_down_fut() final {
     if (allocator) {

diff --git a/src/tools/immutable_object_cache/ObjectCacheStore.cc b/src/tools/immutable_object_cache/ObjectCacheStore.cc
index d1fc911f43cdf5dd5b500880796a2026941a745b..4c74d6a24f860fc18458461a73f4e0df08ad6625 100644 (file)
--- a/src/tools/immutable_object_cache/ObjectCacheStore.cc
+++ b/src/tools/immutable_object_cache/ObjectCacheStore.cc
@@ -276,7 +276,7 @@ int ObjectCacheStore::lookup_object(std::string pool_nspace, uint64_t pool_id,
       return ret;
     default:
       lderr(m_cct) << "unrecognized object cache status" << dendl;
-      ceph_assert(0);
+      ceph_abort();
   }
 }