From eb59c69674eb5de18f8054c7ddc3cd76d795512c Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 23 Aug 2018 16:27:11 -0400 Subject: [PATCH] cleanup: Replace always-false assertions with abort Signed-off-by: Adam C. Emerson --- src/auth/cephx/CephxProtocol.cc | 2 +- src/client/Client.cc | 8 ++-- src/client/Delegation.cc | 2 +- src/client/fuse_ll.cc | 2 +- src/common/Cycles.cc | 4 +- src/common/HeartbeatMap.cc | 2 +- src/common/Thread.cc | 2 +- src/common/assert.cc | 8 ++-- src/common/ceph_context.cc | 8 ++-- src/common/dout.h | 2 +- src/common/perf_histogram.h | 8 ++-- src/crimson/net/SocketConnection.cc | 4 +- src/crush/CrushWrapper.cc | 2 +- src/erasure-code/ErasureCode.cc | 4 +- src/include/mempool.h | 4 +- src/key_value_store/kv_flat_btree_async.cc | 2 +- src/kv/KeyValueDB.h | 2 +- src/kv/KineticStore.cc | 4 +- src/kv/LevelDBStore.cc | 6 +-- src/kv/MemDB.cc | 4 +- src/librbd/io/ObjectDispatchSpec.cc | 2 +- src/librbd/io/ObjectRequest.h | 4 +- src/librbd/operation/MigrateRequest.h | 2 +- src/mds/Locker.cc | 4 +- src/mds/MDBalancer.cc | 2 +- src/mds/MDCache.cc | 4 +- src/mds/MDSTableClient.cc | 2 +- src/mds/MDSTableServer.cc | 2 +- src/mds/Migrator.cc | 8 ++-- src/mds/OpenFileTable.cc | 4 +- src/mds/Server.cc | 4 +- src/mds/SessionMap.cc | 2 +- src/mds/SnapServer.h | 2 +- src/mds/StrayManager.cc | 2 +- src/mds/journal.cc | 2 +- src/messages/MMonQuorumService.h | 4 +- src/messages/MMonScrub.h | 2 +- src/messages/MMonSync.h | 2 +- src/mgr/DaemonServer.cc | 2 +- src/mgr/PyModule.cc | 2 +- src/mgr/PyOSDMap.cc | 12 ++--- src/mon/Monitor.cc | 18 ++++---- src/mon/Monitor.h | 4 +- src/mon/MonitorDBStore.h | 6 +-- src/mon/MonmapMonitor.cc | 2 +- src/mon/OSDMonitor.cc | 24 +++++----- src/mon/OSDMonitor.h | 6 +-- src/mon/PGMap.cc | 2 +- src/mon/PaxosService.cc | 4 +- src/mon/PaxosService.h | 2 +- src/msg/Messenger.h | 2 +- src/msg/async/AsyncConnection.cc | 4 +- src/msg/async/Event.cc | 4 +- .../rdma/RDMAIWARPConnectedSocketImpl.cc | 2 +- src/msg/simple/Pipe.cc | 4 +- src/os/ObjectStore.h | 2 +- src/os/bluestore/BitmapFreelistManager.cc | 2 +- src/os/bluestore/BlueFS.cc | 8 ++-- src/os/bluestore/BlueRocksEnv.cc | 2 +- src/os/bluestore/BlueStore.cc | 38 ++++++++-------- src/os/bluestore/BlueStore.h | 2 +- src/os/bluestore/KernelDevice.cc | 8 ++-- src/os/bluestore/bluestore_types.cc | 8 ++-- src/os/bluestore/bluestore_types.h | 6 +-- src/os/filestore/FileJournal.cc | 8 ++-- src/os/filestore/FileStore.cc | 40 ++++++++--------- src/os/filestore/JournalingObjectStore.cc | 2 +- src/os/filestore/WBThrottle.cc | 2 +- src/os/filestore/chain_xattr.cc | 2 +- src/os/fs/FS.cc | 2 +- src/os/kstore/KStore.cc | 18 ++++---- src/os/memstore/MemStore.cc | 12 ++--- src/osd/ECBackend.cc | 4 +- src/osd/OSD.cc | 10 ++--- src/osd/OSDMap.cc | 2 +- src/osd/PG.cc | 10 ++--- src/osd/PGLog.h | 4 +- src/osd/PGTransaction.h | 2 +- src/osd/PrimaryLogPG.cc | 44 +++++++++---------- src/osd/ReplicatedBackend.cc | 4 +- src/osd/TierAgentState.h | 4 +- src/osd/osd_internal_types.h | 10 ++--- src/osd/osd_types.cc | 8 ++-- src/osd/osd_types.h | 6 +-- src/osdc/Journaler.cc | 2 +- src/osdc/ObjectCacher.cc | 4 +- src/perf_histogram.h | 14 +++--- src/test/admin_socket_output.cc | 2 +- src/test/compressor/test_compression.cc | 2 +- src/test/libcephfs/deleg.cc | 2 +- src/test/librbd/test_mock_ManagedLock.cc | 8 ++-- src/test/mon/test_mon_workloadgen.cc | 4 +- src/test/msgr/test_msgr.cc | 2 +- .../objectstore/DeterministicOpSequence.cc | 2 +- src/test/objectstore/TestObjectStoreState.cc | 2 +- src/test/objectstore/store_test.cc | 2 +- src/test/osd/RadosModel.h | 14 +++--- src/test/rbd_mirror/image_map/test_Policy.cc | 2 +- src/test/signals.cc | 2 +- src/tools/rbd/action/Device.cc | 2 +- src/tools/rbd_mirror/ImageMap.cc | 2 +- src/tools/rbd_mirror/image_map/Types.h | 2 +- 102 files changed, 287 insertions(+), 287 deletions(-) diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc index d815a98c3835f..58cc26f3d73ef 100644 --- a/src/auth/cephx/CephxProtocol.cc +++ b/src/auth/cephx/CephxProtocol.cc @@ -429,7 +429,7 @@ bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys, ldout(cct, 0) << "verify_authorizer could not get service secret for service " << ceph_entity_type_name(service_id) << " secret_id=" << ticket.secret_id << dendl; if (cct->_conf->auth_debug && ticket.secret_id == 0) - ceph_assert(0 == "got secret_id=0"); + ceph_abort_msg("got secret_id=0"); return false; } } diff --git a/src/client/Client.cc b/src/client/Client.cc index fd420acef4e5b..e8b83e10eb729 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -156,7 +156,7 @@ bool Client::CommandHook::call(std::string_view command, else if (command == "status") m_client->dump_status(f.get()); else - ceph_assert(0 == "bad command registered"); + ceph_abort_msg("bad command registered"); m_client->client_lock.Unlock(); f->close_section(); f->flush(out); @@ -1185,7 +1185,7 @@ void Client::insert_readdir_results(MetaRequest *request, MetaSession *session, else dir->readdir_cache[dirp->cache_index] = dn; } else { - ceph_assert(0 == "unexpected readdir buffer idx"); + ceph_abort_msg("unexpected readdir buffer idx"); } dirp->cache_index++; } @@ -1299,7 +1299,7 @@ Inode* Client::insert_trace(MetaRequest *request, MetaSession *session) if ((wanted & CEPH_CAP_XATTR_SHARED) && !(ist.xattr_version > 0 && ist.xattrbl.length() > 0)) - ceph_assert(0 == "MDS reply does not contain xattrs"); + ceph_abort_msg("MDS reply does not contain xattrs"); } in = add_update_inode(&ist, request->sent_stamp, session, @@ -1580,7 +1580,7 @@ int Client::verify_reply_trace(int r, &target, perms); } else { // if the dentry is not linked, just do our best. see #5021. - ceph_assert(0 == "how did this happen? i want logs!"); + ceph_abort_msg("how did this happen? i want logs!"); } } else { Inode *in = request->inode(); diff --git a/src/client/Delegation.cc b/src/client/Delegation.cc index 4761d9882c53d..58d8aaf9d089a 100644 --- a/src/client/Delegation.cc +++ b/src/client/Delegation.cc @@ -57,7 +57,7 @@ int ceph_deleg_caps_for_type(unsigned type) break; default: // Should never happen - ceph_assert(false); + ceph_abort(); } return caps; } diff --git a/src/client/fuse_ll.cc b/src/client/fuse_ll.cc index de5950810b9a8..b112ec7488ce8 100644 --- a/src/client/fuse_ll.cc +++ b/src/client/fuse_ll.cc @@ -1280,7 +1280,7 @@ uint64_t CephFuse::Handle::make_fake_ino(inodeno_t ino, snapid_t snapid) } } if (stag == first) - ceph_assert(0 == "run out of stag"); + ceph_abort_msg("run out of stag"); inodeno_t fino = MAKE_FINO(ino, stag); //cout << "make_fake_ino " << ino << "." << snapid << " -> " << fino << std::endl; diff --git a/src/common/Cycles.cc b/src/common/Cycles.cc index 2d3e6ba7e7884..2ebd246990532 100644 --- a/src/common/Cycles.cc +++ b/src/common/Cycles.cc @@ -67,12 +67,12 @@ void Cycles::init() old_cycles = 0; while (1) { if (gettimeofday(&start_time, NULL) != 0) { - ceph_assert(0 == "couldn't read clock"); + ceph_abort_msg("couldn't read clock"); } uint64_t start_cycles = rdtsc(); while (1) { if (gettimeofday(&stop_time, NULL) != 0) { - ceph_assert(0 == "couldn't read clock"); + ceph_abort_msg("couldn't read clock"); } uint64_t stop_cycles = rdtsc(); micros = (stop_time.tv_usec - start_time.tv_usec) + diff --git a/src/common/HeartbeatMap.cc b/src/common/HeartbeatMap.cc index a6ca11dee382a..222e0b41bab4b 100644 --- a/src/common/HeartbeatMap.cc +++ b/src/common/HeartbeatMap.cc @@ -79,7 +79,7 @@ bool HeartbeatMap::_check(const heartbeat_handle_d *h, const char *who, << " had suicide timed out after " << h->suicide_grace << dendl; pthread_kill(h->thread_id, SIGABRT); sleep(1); - ceph_assert(0 == "hit suicide timeout"); + ceph_abort_msg("hit suicide timeout"); } return healthy; } diff --git a/src/common/Thread.cc b/src/common/Thread.cc index f8362a9a8dfb6..b9e13dc93d5f4 100644 --- a/src/common/Thread.cc +++ b/src/common/Thread.cc @@ -157,7 +157,7 @@ void Thread::create(const char *name, size_t stacksize) int Thread::join(void **prval) { if (thread_id == 0) { - ceph_assert("join on thread that was never started" == 0); + ceph_abort_msg("join on thread that was never started"); return -EINVAL; } diff --git a/src/common/assert.cc b/src/common/assert.cc index 239bd6db0afc1..2803e0b7305bc 100644 --- a/src/common/assert.cc +++ b/src/common/assert.cc @@ -163,11 +163,11 @@ namespace ceph { ostringstream tss; tss << ceph_clock_now(); + char buf[8096]; BackTrace *bt = new BackTrace(1); - ba.printf("%s: In function '%s' thread %llx time %s\n" - "%s: %d: abort()\n", - file, func, (unsigned long long)pthread_self(), tss.str().c_str(), - file, line); + snprintf(buf, sizeof(buf), "%s: In function '%s' thread %llx time %s\n" + "%s: %d: abort()\n", file, func, (unsigned long long)pthread_self(), + tss.str().c_str(), file, line); dout_emergency(msg); // TODO: get rid of this memory allocation. diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index 861e78dc51f9c..2e633fbed74df 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -393,11 +393,9 @@ void CephContext::do_command(std::string_view command, const cmdmap_t& cmdmap, } lgeneric_dout(this, 1) << "do_command '" << command << "' '" << ss.str() << dendl; - if (command == "assert" && _conf->debug_asok_assert_abort) { - ceph_assert(0 == "assert"); - } + ceph_assert_always(!(command == "assert" && _conf->debug_asok_assert_abort)); if (command == "abort" && _conf->debug_asok_assert_abort) { - ceph_abort(); + ceph_abort(); } if (command == "perfcounters_dump" || command == "1" || command == "perf dump") { @@ -534,7 +532,7 @@ void CephContext::do_command(std::string_view command, const cmdmap_t& cmdmap, _log->reopen_log_file(); } else { - ceph_assert(0 == "registered under wrong command?"); + ceph_abort_msg("registered under wrong command?"); } f->close_section(); } diff --git a/src/common/dout.h b/src/common/dout.h index d9b3acfec48c0..c423c0818b841 100644 --- a/src/common/dout.h +++ b/src/common/dout.h @@ -32,7 +32,7 @@ extern void dout_emergency(const std::string &str); class _bad_endl_use_dendl_t { public: _bad_endl_use_dendl_t(int) {} }; static const _bad_endl_use_dendl_t endl = 0; inline std::ostream& operator<<(std::ostream& out, _bad_endl_use_dendl_t) { - ceph_assert(0 && "you are using the wrong endl.. use std::endl or dendl"); + ceph_abort_msg("you are using the wrong endl.. use std::endl or dendl"); return out; } diff --git a/src/common/perf_histogram.h b/src/common/perf_histogram.h index de442825bd1cf..dc4832e36499b 100644 --- a/src/common/perf_histogram.h +++ b/src/common/perf_histogram.h @@ -79,8 +79,8 @@ public: int i = 0; for (const auto &ac : axes_config) { - ceph_assert(ac.m_buckets > 0 && "Must have at least one bucket on axis"); - ceph_assert(ac.m_quant_size > 0 && + ceph_assertf(ac.m_buckets > 0, "Must have at least one bucket on axis"); + ceph_assertf(ac.m_quant_size > 0, "Quantization unit must be non-zero positive integer value"); m_axes_config[i++] = ac; @@ -178,8 +178,8 @@ protected: static_assert(sizeof...(T) == DIM, "Incorrect number of arguments"); return get_raw_index_internal<0>( [](int64_t bucket, const axis_config_d &ac) { - ceph_assert(bucket >= 0 && "Bucket index can not be negative"); - ceph_assert(bucket < ac.m_buckets && "Bucket index too large"); + ceph_assertf(bucket >= 0, "Bucket index can not be negative"); + ceph_assertf(bucket < ac.m_buckets, "Bucket index too large"); return bucket; }, 0, buckets...); diff --git a/src/crimson/net/SocketConnection.cc b/src/crimson/net/SocketConnection.cc index e7984223bbb9c..67a3e3d177184 100644 --- a/src/crimson/net/SocketConnection.cc +++ b/src/crimson/net/SocketConnection.cc @@ -245,12 +245,12 @@ bool SocketConnection::update_rx_seq(seq_num_t seq) if (seq <= in_seq) { if (HAVE_FEATURE(features, RECONNECT_SEQ) && conf.ms_die_on_old_message) { - ceph_assert(0 == "old msgs despite reconnect_seq feature"); + ceph_abort_msg("old msgs despite reconnect_seq feature"); } return false; } else if (seq > in_seq + 1) { if (conf.ms_die_on_skipped_message) { - ceph_assert(0 == "skipped incoming seq"); + ceph_abort_msg("skipped incoming seq"); } return false; } else { diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index 361a638ee422b..c1cbc2936aa9f 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -1642,7 +1642,7 @@ int32_t CrushWrapper::_alloc_class_id() const { } } } while (class_id != start); - ceph_assert(0 == "no available class id"); + ceph_abort_msg("no available class id"); } void CrushWrapper::reweight(CephContext *cct) diff --git a/src/erasure-code/ErasureCode.cc b/src/erasure-code/ErasureCode.cc index 2a6c68c83dadf..22f9cd48d204c 100644 --- a/src/erasure-code/ErasureCode.cc +++ b/src/erasure-code/ErasureCode.cc @@ -193,7 +193,7 @@ int ErasureCode::encode(const set &want_to_encode, int ErasureCode::encode_chunks(const set &want_to_encode, map *encoded) { - ceph_assert("ErasureCode::encode_chunks not implemented" == 0); + ceph_abort_msg("ErasureCode::encode_chunks not implemented"); } int ErasureCode::_decode(const set &want_to_read, @@ -245,7 +245,7 @@ int ErasureCode::decode_chunks(const set &want_to_read, const map &chunks, map *decoded) { - ceph_assert("ErasureCode::decode_chunks not implemented" == 0); + ceph_abort_msg("ErasureCode::decode_chunks not implemented"); } int ErasureCode::parse(const ErasureCodeProfile &profile, diff --git a/src/include/mempool.h b/src/include/mempool.h index a07d167e36a99..e03a1f9071460 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -514,10 +514,10 @@ bool operator!=(const std::vector>& lh #define MEMPOOL_CLASS_HELPERS() \ void *operator new(size_t size); \ void *operator new[](size_t size) noexcept { \ - ceph_assert(0 == "no array new"); \ + ceph_abort_msg("no array new"); \ return nullptr; } \ void operator delete(void *); \ - void operator delete[](void *) { ceph_assert(0 == "no array delete"); } + void operator delete[](void *) { ceph_abort_msg("no array delete"); } // Use this in some particular .cc file to match each class with a diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc index 942aa61b5f47a..cdf3ef28a93bb 100644 --- a/src/key_value_store/kv_flat_btree_async.cc +++ b/src/key_value_store/kv_flat_btree_async.cc @@ -279,7 +279,7 @@ int KvFlatBtreeAsync::read_index(const string &key, index_data * idata, cerr << "\t" << client_name << "-read_index: getting keys failed with " << err << std::endl; - ceph_assert(0 == client_name + "-read_index: reading index failed"); + ceph_abort_msg(client_name + "-read_index: reading index failed"); return err; } kvmap.insert(dupmap.begin(), dupmap.end()); diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h index 0f5c509726d31..f9d9665aed63e 100644 --- a/src/kv/KeyValueDB.h +++ b/src/kv/KeyValueDB.h @@ -142,7 +142,7 @@ public: const std::string &prefix, ///< [in] Prefix/CF ==> MUST match some established merge operator const std::string &key, ///< [in] Key to be merged const bufferlist &value ///< [in] value to be merged into key - ) { ceph_assert(0 == "Not implemented"); } + ) { ceph_abort_msg("Not implemented"); } virtual ~TransactionImpl() {} }; diff --git a/src/kv/KineticStore.cc b/src/kv/KineticStore.cc index 95c76380e042c..ac6ac8f38fb11 100644 --- a/src/kv/KineticStore.cc +++ b/src/kv/KineticStore.cc @@ -47,7 +47,7 @@ int KineticStore::_test_init(CephContext *c) int KineticStore::open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, false); } @@ -55,7 +55,7 @@ int KineticStore::open(ostream &out, const vector& cfs) int KineticStore::create_and_open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, true); } diff --git a/src/kv/LevelDBStore.cc b/src/kv/LevelDBStore.cc index 214cf77c4120e..fdad594bba321 100644 --- a/src/kv/LevelDBStore.cc +++ b/src/kv/LevelDBStore.cc @@ -61,14 +61,14 @@ int LevelDBStore::init(string option_str) int LevelDBStore::open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, false); } int LevelDBStore::create_and_open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, true); } @@ -93,7 +93,7 @@ int LevelDBStore::load_leveldb_options(bool create_if_missing, leveldb::Options filterpolicy.reset(_filterpolicy); ldoptions.filter_policy = filterpolicy.get(); #else - ceph_assert(0 == "bloom size set but installed leveldb doesn't support bloom filters"); + ceph_abort_msg(0 == "bloom size set but installed leveldb doesn't support bloom filters"); #endif } if (options.compression_enabled) diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc index 649352fd51bef..cadda26d5716d 100644 --- a/src/kv/MemDB.cc +++ b/src/kv/MemDB.cc @@ -177,14 +177,14 @@ int MemDB::do_open(ostream &out, bool create) int MemDB::open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, false); } int MemDB::create_and_open(ostream &out, const vector& cfs) { if (!cfs.empty()) { - ceph_assert(0 == "Not implemented"); + ceph_abort_msg("Not implemented"); } return do_open(out, true); } diff --git a/src/librbd/io/ObjectDispatchSpec.cc b/src/librbd/io/ObjectDispatchSpec.cc index bc60dfe010e73..2b6dccc5cfcae 100644 --- a/src/librbd/io/ObjectDispatchSpec.cc +++ b/src/librbd/io/ObjectDispatchSpec.cc @@ -23,7 +23,7 @@ void ObjectDispatchSpec::C_Dispatcher::complete(int r) { finish(r); break; case DISPATCH_RESULT_INVALID: - ceph_assert(false); + ceph_abort(); break; } } diff --git a/src/librbd/io/ObjectRequest.h b/src/librbd/io/ObjectRequest.h index d1ce8f1461cbd..f27dc9668c7e5 100644 --- a/src/librbd/io/ObjectRequest.h +++ b/src/librbd/io/ObjectRequest.h @@ -327,7 +327,7 @@ public: case DISCARD_ACTION_ZERO: return "zero"; } - ceph_assert(false); + ceph_abort(); return nullptr; } @@ -371,7 +371,7 @@ protected: wr->zero(this->m_object_off, this->m_object_len); break; default: - ceph_assert(false); + ceph_abort(); break; } } diff --git a/src/librbd/operation/MigrateRequest.h b/src/librbd/operation/MigrateRequest.h index 654356b6887f9..99f3b012d2cbc 100644 --- a/src/librbd/operation/MigrateRequest.h +++ b/src/librbd/operation/MigrateRequest.h @@ -30,7 +30,7 @@ protected: return true; } journal::Event create_event(uint64_t op_tid) const override { - ceph_assert(0); + ceph_abort(); return journal::UnknownEvent(); } diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index e0950815e8fa1..d70d77453d991 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -113,7 +113,7 @@ void Locker::dispatch(const Message::const_ref &m) break; default: derr << "locker unknown message " << m->get_type() << dendl; - ceph_assert(0 == "locker unknown message"); + ceph_abort_msg("locker unknown message"); } } @@ -4699,7 +4699,7 @@ void Locker::scatter_tempsync(ScatterLock *lock, bool *need_issue) ceph_assert(lock->get_parent()->is_auth()); ceph_assert(lock->is_stable()); - ceph_assert(0 == "not fully implemented, at least not for filelock"); + ceph_abort_msg("not fully implemented, at least not for filelock"); CInode *in = static_cast(lock->get_parent()); diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index 26c3177deac84..1a029135dc693 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -69,7 +69,7 @@ int MDBalancer::proc_message(const Message::const_ref &m) default: derr << " balancer unknown message " << m->get_type() << dendl_impl; - ceph_assert(0 == "balancer unknown message"); + ceph_abort_msg("balancer unknown message"); } return 0; diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 28ac5a41a397b..a115fdbdb0e17 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -5791,7 +5791,7 @@ void MDCache::do_cap_import(Session *session, CInode *in, Capability *cap, reap->set_cap_peer(p_cap_id, p_seq, p_mseq, peer, p_flags); mds->send_message_client_counted(reap, session); } else { - ceph_assert(0); + ceph_abort(); } } @@ -7968,7 +7968,7 @@ void MDCache::dispatch(const Message::const_ref &m) default: derr << "cache unknown message " << m->get_type() << dendl; - ceph_assert(0 == "cache unknown message"); + ceph_abort_msg("cache unknown message"); } } diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc index af0fe5b384153..4187fee082f54 100644 --- a/src/mds/MDSTableClient.cc +++ b/src/mds/MDSTableClient.cc @@ -139,7 +139,7 @@ void MDSTableClient::handle_request(const MMDSTableRequest::const_ref &m) break; default: - ceph_assert(0 == "unrecognized mds_table_client request op"); + ceph_abort_msg("unrecognized mds_table_client request op"); } } diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc index 138c0d669faf8..ffba78c0ef254 100644 --- a/src/mds/MDSTableServer.cc +++ b/src/mds/MDSTableServer.cc @@ -33,7 +33,7 @@ void MDSTableServer::handle_request(const MMDSTableRequest::const_ref &req) case TABLESERVER_OP_COMMIT: return handle_commit(req); case TABLESERVER_OP_ROLLBACK: return handle_rollback(req); case TABLESERVER_OP_NOTIFY_ACK: return handle_notify_ack(req); - default: ceph_assert(0 == "unrecognized mds_table_server request op"); + default: ceph_abort_msg("unrecognized mds_table_server request op"); } } diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index b4dfe09040568..3c6473def58fc 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -148,7 +148,7 @@ void Migrator::dispatch(const Message::const_ref &m) default: derr << "migrator unknown message " << m->get_type() << dendl; - ceph_assert(0 == "migrator unknown message"); + ceph_abort_msg("migrator unknown message"); } } @@ -2432,7 +2432,7 @@ void Migrator::handle_export_cancel(const MExportDirCancel::const_ref &m) dirfrag_t df = m->get_dirfrag(); map::iterator it = import_state.find(df); if (it == import_state.end()) { - ceph_assert(0 == "got export_cancel in weird state"); + ceph_abort_msg("got export_cancel in weird state"); } else if (it->second.state == IMPORT_DISCOVERING) { import_reverse_discovering(df); } else if (it->second.state == IMPORT_DISCOVERED) { @@ -2453,7 +2453,7 @@ void Migrator::handle_export_cancel(const MExportDirCancel::const_ref &m) cache->adjust_subtree_auth(dir, it->second.peer); import_reverse_unfreeze(dir); } else { - ceph_assert(0 == "got export_cancel in weird state"); + ceph_abort_msg("got export_cancel in weird state"); } } @@ -2566,7 +2566,7 @@ void Migrator::handle_export_prep(const MExportDirPrep::const_ref &m, bool did_a } else if (start == '-') { // nothing } else - ceph_assert(0 == "unrecognized start char"); + ceph_abort_msg("unrecognized start char"); while (!q.end()) { CDentry *dn = cache->add_replica_dentry(q, cur, finished); diff --git a/src/mds/OpenFileTable.cc b/src/mds/OpenFileTable.cc index a8795d2ade8f2..d9777581f0abb 100644 --- a/src/mds/OpenFileTable.cc +++ b/src/mds/OpenFileTable.cc @@ -1010,7 +1010,7 @@ void OpenFileTable::_open_ino_finish(inodeno_t ino, int r) finish_contexts(g_ceph_context, waiting_for_prefetch); waiting_for_prefetch.clear(); } else { - ceph_assert(0); + ceph_abort(); } } } @@ -1093,7 +1093,7 @@ void OpenFileTable::_prefetch_inodes() else if (prefetch_state == FILE_INODES) pool = mds->mdsmap->get_first_data_pool(); else - ceph_assert(0); + ceph_abort(); MDCache *mdcache = mds->mdcache; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 5728f11f1c146..72efb1752cd00 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -264,7 +264,7 @@ void Server::dispatch(const Message::const_ref &m) return; default: derr << "server unknown message " << m->get_type() << dendl; - ceph_assert(0 == "server unknown message"); + ceph_abort_msg("server unknown message"); } } @@ -1380,7 +1380,7 @@ void Server::respond_to_request(MDRequestRef& mdr, int r) } else if (mdr->internal_op > -1) { dout(10) << "respond_to_request on internal request " << mdr << dendl; if (!mdr->internal_op_finish) - ceph_assert(0 == "trying to respond to internal op without finisher"); + ceph_abort_msg("trying to respond to internal op without finisher"); mdr->internal_op_finish->complete(r); mdcache->request_finish(mdr); } diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index afe37fe7a6bb5..429238b7b8b30 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -324,7 +324,7 @@ void SessionMap::_load_legacy_finish(int r, bufferlist &bl) auto blp = bl.cbegin(); if (r < 0) { derr << "_load_finish got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "failed to load sessionmap"); + ceph_abort_msg("failed to load sessionmap"); } dump(); decode_legacy(blp); // note: this sets last_cap_renew = now() diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h index 0a21a756e56a2..7c4262fc51ec1 100644 --- a/src/mds/SnapServer.h +++ b/src/mds/SnapServer.h @@ -123,7 +123,7 @@ public: else if (ino == MDS_INO_MDSDIR(rank)) mdsdir_scrubbed = true; else - ceph_assert(0); + ceph_abort(); } bool can_allow_multimds_snaps() const { return (root_scrubbed && mdsdir_scrubbed) || diff --git a/src/mds/StrayManager.cc b/src/mds/StrayManager.cc index 0ace8b8c08991..145e962e3aeb0 100644 --- a/src/mds/StrayManager.cc +++ b/src/mds/StrayManager.cc @@ -203,7 +203,7 @@ void StrayManager::_purge_stray_purged( // is being purged (aside from it were derr << "Rogue reference after purge to " << *dn << dendl; - ceph_assert(0 == "rogue reference to purging inode"); + ceph_abort_msg("rogue reference to purging inode"); } // kill dentry. diff --git a/src/mds/journal.cc b/src/mds/journal.cc index ed256e55e5e98..86054158ae281 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -311,7 +311,7 @@ void EMetaBlob::add_dir_context(CDir *dir, int mode) !dir->state_test(CDir::STATE_AUXSUBTREE) && !diri->state_test(CInode::STATE_AMBIGUOUSAUTH)) { dout(0) << "EMetaBlob::add_dir_context unexpected subtree " << *dir << dendl; - ceph_assert(0); + ceph_abort(); } dout(20) << "EMetaBlob::add_dir_context(" << dir << ") ambiguous or transient subtree " << dendl; } else { diff --git a/src/messages/MMonQuorumService.h b/src/messages/MMonQuorumService.h index c97b371982f21..dda90d2f3ca43 100644 --- a/src/messages/MMonQuorumService.h +++ b/src/messages/MMonQuorumService.h @@ -57,11 +57,11 @@ public: } void encode_payload(uint64_t features) override { - ceph_assert(0 == "MMonQuorumService message must always be a base class"); + ceph_abort_msg("MMonQuorumService message must always be a base class"); } void decode_payload() override { - ceph_assert(0 == "MMonQuorumService message must always be a base class"); + ceph_abort_msg("MMonQuorumService message must always be a base class"); } const char *get_type_name() const override { return "quorum_service"; } diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h index b105be624ee2c..3232aa88a563e 100644 --- a/src/messages/MMonScrub.h +++ b/src/messages/MMonScrub.h @@ -33,7 +33,7 @@ public: switch (op) { case OP_SCRUB: return "scrub"; case OP_RESULT: return "result"; - default: ceph_assert(0 == "unknown op type"); return NULL; + default: ceph_abort_msg("unknown op type"); return NULL; } } diff --git a/src/messages/MMonSync.h b/src/messages/MMonSync.h index 8ccc2cdbc3faf..595602a6e8455 100644 --- a/src/messages/MMonSync.h +++ b/src/messages/MMonSync.h @@ -51,7 +51,7 @@ public: case OP_CHUNK: return "chunk"; case OP_LAST_CHUNK: return "last_chunk"; case OP_NO_COOKIE: return "no_cookie"; - default: ceph_assert(0 == "unknown op type"); return NULL; + default: ceph_abort_msg("unknown op type"); return NULL; } } diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 47fde57a65367..0a802227ce045 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -1533,7 +1533,7 @@ bool DaemonServer::handle_command(MCommand *m) } break; default: - ceph_assert(0 == "actual_op value is not supported"); + ceph_abort_msg("actual_op value is not supported"); } parsed_pgs.push_back(std::move(parsed_pg)); diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc index a71d6c67db211..90333629a60da 100644 --- a/src/mgr/PyModule.cc +++ b/src/mgr/PyModule.cc @@ -301,7 +301,7 @@ void PyModule::init_ceph_module() for (auto [name, type] : classes) { type->tp_new = PyType_GenericNew; if (PyType_Ready(type) < 0) { - ceph_assert(0); + ceph_abort(); } Py_INCREF(type); diff --git a/src/mgr/PyOSDMap.cc b/src/mgr/PyOSDMap.cc index 3b050d29d4797..f2381dc2cf084 100644 --- a/src/mgr/PyOSDMap.cc +++ b/src/mgr/PyOSDMap.cc @@ -192,8 +192,8 @@ BasePyOSDMap_init(BasePyOSDMap *self, PyObject *args, PyObject *kwds) if (! PyArg_ParseTupleAndKeywords(args, kwds, "O", const_cast(kwlist), &osdmap_capsule)) { - ceph_assert(0); - return -1; + ceph_abort(); + return -1; } ceph_assert(PyObject_TypeCheck(osdmap_capsule, &PyCapsule_Type)); @@ -291,8 +291,8 @@ BasePyOSDMapIncremental_init(BasePyOSDMapIncremental *self, if (! PyArg_ParseTupleAndKeywords(args, kwds, "O", const_cast(kwlist), &inc_capsule)) { - ceph_assert(0); - return -1; + ceph_abort(); + return -1; } ceph_assert(PyObject_TypeCheck(inc_capsule, &PyCapsule_Type)); @@ -460,8 +460,8 @@ BasePyCRUSH_init(BasePyCRUSH *self, if (! PyArg_ParseTupleAndKeywords(args, kwds, "O", const_cast(kwlist), &crush_capsule)) { - ceph_assert(0); - return -1; + ceph_abort(); + return -1; } ceph_assert(PyObject_TypeCheck(crush_capsule, &PyCapsule_Type)); diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 5cf0de4675cb6..d51e9e8948502 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -340,7 +340,7 @@ void Monitor::do_admin_command(std::string_view command, const cmdmap_t& cmdmap, please enable \"mon_enable_op_tracker\", and the tracker will start to track new ops received afterwards."; } } else { - ceph_assert(0 == "bad AdminSocket command binding"); + ceph_abort_msg("bad AdminSocket command binding"); } (read_only ? audit_clog->debug() : audit_clog->info()) << "from='admin socket' " @@ -1162,7 +1162,7 @@ void Monitor::sync_obtain_latest_monmap(bufferlist &bl) derr << __func__ << " something wrong happened while reading the store: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error reading the store"); + ceph_abort_msg("error reading the store"); } } else { latest_monmap.decode(monmon_bl); @@ -1176,7 +1176,7 @@ void Monitor::sync_obtain_latest_monmap(bufferlist &bl) derr << __func__ << " something wrong happened while reading the store: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error reading the store"); + ceph_abort_msg("error reading the store"); } ceph_assert(backup_bl.length() > 0); @@ -1363,7 +1363,7 @@ void Monitor::handle_sync(MonOpRequestRef op) default: dout(0) << __func__ << " unknown op " << m->op << dendl; - ceph_assert(0 == "unknown op"); + ceph_abort_msg("unknown op"); } } @@ -3313,7 +3313,7 @@ void Monitor::handle_command(MonOpRequestRef op) ds << '\n'; } } else { - ceph_assert(0 == "We should never get here!"); + ceph_abort_msg("We should never get here!"); return; } rdata.append(ds); @@ -4381,7 +4381,7 @@ void Monitor::timecheck_start_round() ceph_assert(is_leader()); if (monmap->size() == 1) { - ceph_assert(0 == "We are alone; this shouldn't have been scheduled!"); + ceph_abort_msg("We are alone; this shouldn't have been scheduled!"); return; } @@ -4490,7 +4490,7 @@ void Monitor::timecheck_check_skews() ceph_assert(is_leader()); ceph_assert((timecheck_round % 2) == 0); if (monmap->size() == 1) { - ceph_assert(0 == "We are alone; we shouldn't have gotten here!"); + ceph_abort_msg("We are alone; we shouldn't have gotten here!"); return; } ceph_assert(timecheck_latencies.size() == timecheck_skews.size()); @@ -4527,7 +4527,7 @@ void Monitor::timecheck_report() ceph_assert(is_leader()); ceph_assert((timecheck_round % 2) == 0); if (monmap->size() == 1) { - ceph_assert(0 == "We are alone; we shouldn't have gotten here!"); + ceph_abort_msg("We are alone; we shouldn't have gotten here!"); return; } @@ -4565,7 +4565,7 @@ void Monitor::timecheck() dout(10) << __func__ << dendl; ceph_assert(is_leader()); if (monmap->size() == 1) { - ceph_assert(0 == "We are alone; we shouldn't have gotten here!"); + ceph_abort_msg("We are alone; we shouldn't have gotten here!"); return; } ceph_assert(timecheck_round % 2 != 0); diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h index e5311bb22327c..6f8e3ca451bcd 100644 --- a/src/mon/Monitor.h +++ b/src/mon/Monitor.h @@ -849,7 +849,7 @@ public: else if (r == -EAGAIN) mon->dispatch_op(op); else - ceph_assert(0 == "bad C_Command return value"); + ceph_abort_msg("bad C_Command return value"); } }; @@ -866,7 +866,7 @@ public: else if (r == -ECANCELED) return; else - ceph_assert(0 == "bad C_RetryMessage return value"); + ceph_abort_msg("bad C_RetryMessage return value"); } }; diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index 730c5ff6721d4..e037ee44d8682 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -308,7 +308,7 @@ class MonitorDBStore compact.pop_front(); } } else { - ceph_assert(0 == "failed to write to db"); + ceph_abort_msg("failed to write to db"); } return r; } @@ -533,7 +533,7 @@ class MonitorDBStore generic_dout(0) << "MonitorDBStore::get() error obtaining" << " (" << prefix << ":" << key << "): " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error obtaining key"); + ceph_abort_msg("error obtaining key"); } ceph_assert(bl.length()); @@ -600,7 +600,7 @@ class MonitorDBStore derr << __func__ << " error initializing " << kv_type << " db back storage in " << full_path << dendl; - ceph_assert(0 == "MonitorDBStore: error initializing keyvaluedb back storage"); + ceph_abort_msg("MonitorDBStore: error initializing keyvaluedb back storage"); } db.reset(db_ptr); diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index 818ef1a481801..0e627399fef05 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -122,7 +122,7 @@ class C_ApplyFeatures : public Context { // established them in the first place. return; } else { - ceph_assert(0 == "bad C_ApplyFeatures return value"); + ceph_abort_msg("bad C_ApplyFeatures return value"); } } }; diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 97bb06a4703f5..53e17974c4bbc 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -347,7 +347,7 @@ void OSDMonitor::create_initial() int r = ceph_release_from_name( g_conf()->mon_osd_initial_require_min_compat_client.c_str()); if (r <= 0) { - ceph_assert(0 == "mon_osd_initial_require_min_compat_client is not valid"); + ceph_abort_msg("mon_osd_initial_require_min_compat_client is not valid"); } newmap.require_min_compat_client = r; } @@ -1704,7 +1704,7 @@ void OSDMonitor::load_osdmap_manifest() int r = get_value("osdmap_manifest", manifest_bl); if (r < 0) { derr << __func__ << " unable to read osdmap version manifest" << dendl; - ceph_assert(0 == "error reading manifest"); + ceph_abort_msg("error reading manifest"); } osdmap_manifest.decode(manifest_bl); has_osdmap_manifest = true; @@ -3798,7 +3798,7 @@ int OSDMonitor::get_full_from_pinned_map(version_t ver, bufferlist& bl) derr << __func__ << " osdmap crc mismatch! (osdmap crc " << tosdm.get_crc() << ", expected " << inc.full_crc << ")" << dendl; - ceph_assert(0 == "osdmap crc mismatch"); + ceph_abort_msg("osdmap crc mismatch"); } } @@ -7423,7 +7423,7 @@ void OSDMonitor::do_osd_create( *new_id = pending_inc.new_max_osd - 1; ceph_assert(*new_id == allocated_id); } else { - ceph_assert(0 == "unexpected condition"); + ceph_abort_msg("unexpected condition"); } out: @@ -9969,7 +9969,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } } } @@ -10031,7 +10031,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, osdmap.get_noout_osds(&osds); break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } // cancel any pending noup/nodown/noin/noout requests too @@ -10069,7 +10069,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } } @@ -10137,7 +10137,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } } } @@ -10387,7 +10387,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } switch (option) { @@ -10530,7 +10530,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, break; default: - ceph_assert(0 == "invalid option"); + ceph_abort_msg("invalid option"); } goto update; @@ -11779,7 +11779,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (field == "max_bytes") { value = strict_iecstrtoll(val.c_str(), &tss); } else { - ceph_assert(0 == "unrecognized option"); + ceph_abort_msg("unrecognized option"); } if (!tss.empty()) { ss << "error parsing value '" << val << "': " << tss; @@ -11793,7 +11793,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (field == "max_bytes") { pi->quota_max_bytes = value; } else { - ceph_assert(0 == "unrecognized option"); + ceph_abort_msg("unrecognized option"); } ss << "set-quota " << field << " = " << value << " for pool " << poolstr; rs = ss.str(); diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 9dfbf4c8a0ee8..00560e0688976 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -491,7 +491,7 @@ private: else if (r == -EAGAIN) cmon->dispatch(op); else - ceph_assert(0 == "bad C_Booted return value"); + ceph_abort_msg("bad C_Booted return value"); } }; @@ -508,7 +508,7 @@ private: else if (r == -EAGAIN) osdmon->dispatch(op); else - ceph_assert(0 == "bad C_ReplyMap return value"); + ceph_abort_msg("bad C_ReplyMap return value"); } }; struct C_PoolOp : public C_MonOp { @@ -529,7 +529,7 @@ private: else if (r == -EAGAIN) osdmon->dispatch(op); else - ceph_assert(0 == "bad C_PoolOp return value"); + ceph_abort_msg("bad C_PoolOp return value"); } }; diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 63939f600cb8e..488b4a97f9640 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -684,7 +684,7 @@ static float pool_raw_used_rate(const OSDMap &osd_map, int64_t poolid) } break; default: - ceph_assert(0 == "unrecognized pool type"); + ceph_abort_msg("unrecognized pool type"); } } diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index f4894b58bb26d..7d3ff2c7b9876 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -124,7 +124,7 @@ bool PaxosService::dispatch(MonOpRequestRef op) } else if (r == -ECANCELED || r == -EAGAIN) { return; } else { - ceph_assert(0 == "bad return value for proposal_timer"); + ceph_abort_msg("bad return value for proposal_timer"); } }); dout(10) << " setting proposal_timer " << do_propose @@ -240,7 +240,7 @@ void PaxosService::propose_pending() else if (r == -ECANCELED || r == -EAGAIN) return; else - ceph_assert(0 == "bad return value for C_Committed"); + ceph_abort_msg("bad return value for C_Committed"); } }; paxos->queue_pending_finisher(new C_Committed(this)); diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h index 07a51c8ebe6e2..3e396b3786171 100644 --- a/src/mon/PaxosService.h +++ b/src/mon/PaxosService.h @@ -120,7 +120,7 @@ public: else if (r == -ECANCELED) return; else - ceph_assert(0 == "bad C_RetryMessage return value"); + ceph_abort_msg("bad C_RetryMessage return value"); } }; diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index f0e0f8af4e092..04067411c93db 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -632,7 +632,7 @@ public: /** * Deliver a single Message. Send it to each Dispatcher * in sequence until one of them handles it. - * If none of our Dispatchers can handle it, ceph_assert(0). + * If none of our Dispatchers can handle it, ceph_abort(). * * @param m The Message to deliver. */ diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index 674a6714871c4..15027e5b54d4d 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -726,14 +726,14 @@ void AsyncConnection::process() << ", discarding" << dendl; message->put(); if (has_feature(CEPH_FEATURE_RECONNECT_SEQ) && async_msgr->cct->_conf->ms_die_on_old_message) - ceph_assert(0 == "old msgs despite reconnect_seq feature"); + ceph_abort_msg("old msgs despite reconnect_seq feature"); break; } if (message->get_seq() > cur_seq + 1) { ldout(async_msgr->cct, 0) << __func__ << " missed message? skipped from seq " << cur_seq << " to " << message->get_seq() << dendl; if (async_msgr->cct->_conf->ms_die_on_skipped_message) - ceph_assert(0 == "skipped incoming seq"); + ceph_abort_msg("skipped incoming seq"); } message->set_connection(this); diff --git a/src/msg/async/Event.cc b/src/msg/async/Event.cc index aee9a390493c1..bb48622a226cc 100644 --- a/src/msg/async/Event.cc +++ b/src/msg/async/Event.cc @@ -234,7 +234,7 @@ int EventCenter::create_file_event(int fd, int mask, EventCallbackRef ctxt) // add_event shouldn't report error, otherwise it must be a innermost bug! lderr(cct) << __func__ << " add event failed, ret=" << r << " fd=" << fd << " mask=" << mask << " original mask is " << event->mask << dendl; - ceph_assert(0 == "BUG!"); + ceph_abort_msg("BUG!"); return r; } @@ -267,7 +267,7 @@ void EventCenter::delete_file_event(int fd, int mask) int r = driver->del_event(fd, event->mask, mask); if (r < 0) { // see create_file_event - ceph_assert(0 == "BUG!"); + ceph_abort_msg("BUG!"); } if (mask & EVENT_READABLE && event->read_cb) { diff --git a/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc b/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc index d5762d6eb5ccd..ca39b09f26d4c 100644 --- a/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc +++ b/src/msg/async/rdma/RDMAIWARPConnectedSocketImpl.cc @@ -142,7 +142,7 @@ void RDMAIWARPConnectedSocketImpl::handle_cm_connection() { break; default: - ceph_assert(0 == "unhandled event"); + ceph_abort_msg("unhandled event"); break; } rdma_ack_cm_event(event); diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index d8f595eade51c..8005cf8947da4 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -1773,14 +1773,14 @@ void Pipe::reader() m->put(); if (connection_state->has_feature(CEPH_FEATURE_RECONNECT_SEQ) && msgr->cct->_conf->ms_die_on_old_message) - ceph_assert(0 == "old msgs despite reconnect_seq feature"); + ceph_abort_msg("old msgs despite reconnect_seq feature"); continue; } if (m->get_seq() > in_seq + 1) { ldout(msgr->cct,0) << "reader missed message? skipped from seq " << in_seq << " to " << m->get_seq() << dendl; if (msgr->cct->_conf->ms_die_on_skipped_message) - ceph_assert(0 == "skipped incoming seq"); + ceph_abort_msg("skipped incoming seq"); } m->set_connection(connection_state.get()); diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 85b4ef329d1c3..2ef00640f24e0 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -683,7 +683,7 @@ public: break; default: - ceph_assert(0 == "Unknown OP"); + ceph_abort_msg("Unknown OP"); } } void _update_op_bl( diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc index 2435a0a19444d..87066f0942dce 100644 --- a/src/os/bluestore/BitmapFreelistManager.cc +++ b/src/os/bluestore/BitmapFreelistManager.cc @@ -452,7 +452,7 @@ void BitmapFreelistManager::_verify_range(uint64_t offset, uint64_t length, } if (errors) { derr << __func__ << " saw " << errors << " errors" << dendl; - ceph_assert(0 == "bitmap freelist errors"); + ceph_abort_msg("bitmap freelist errors"); } } diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index bf81bfa73578e..837282b63110e 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -713,7 +713,7 @@ int BlueFS::_replay(bool noop, bool to_stdout) dout(10) << __func__ << " 0x" << std::hex << read_pos << ": stop: failed to skip to " << offset << std::dec << dendl; - ceph_assert(0 == "problem with op_jump"); + ceph_abort_msg("problem with op_jump"); } } } @@ -1663,7 +1663,7 @@ int BlueFS::_flush_range(FileWriter *h, uint64_t offset, uint64_t length) derr << __func__ << " allocated: 0x" << std::hex << allocated << " offset: 0x" << offset << " length: 0x" << length << std::dec << dendl; - ceph_assert(0 == "bluefs enospc"); + ceph_abort_msg("bluefs enospc"); return r; } if (cct->_conf->bluefs_preextend_wal_files && @@ -1900,7 +1900,7 @@ int BlueFS::_truncate(FileWriter *h, uint64_t offset) << " unflushed bytes" << dendl; t.substr_of(h->buffer, 0, offset - h->pos); h->buffer.swap(t); - ceph_assert(0 == "actually this shouldn't happen"); + ceph_abort_msg("actually this shouldn't happen"); } if (h->buffer.length()) { int r = _flush(h, true); @@ -1911,7 +1911,7 @@ int BlueFS::_truncate(FileWriter *h, uint64_t offset) return 0; // no-op! } if (offset > h->file->fnode.size) { - ceph_assert(0 == "truncate up not supported"); + ceph_abort_msg("truncate up not supported"); } ceph_assert(h->file->fnode.size >= offset); h->file->fnode.size = offset; diff --git a/src/os/bluestore/BlueRocksEnv.cc b/src/os/bluestore/BlueRocksEnv.cc index b33005e149b41..c384f2ecb091a 100644 --- a/src/os/bluestore/BlueRocksEnv.cc +++ b/src/os/bluestore/BlueRocksEnv.cc @@ -23,7 +23,7 @@ rocksdb::Status err_to_status(int r) return rocksdb::Status::IOError(strerror(r)); default: // FIXME :( - ceph_assert(0 == "unrecognized error code"); + ceph_abort_msg("unrecognized error code"); return rocksdb::Status::NotSupported(rocksdb::Status::kNone); } } diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 5f9935d350d94..90f2a0e869099 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -777,7 +777,7 @@ BlueStore::Cache *BlueStore::Cache::create(CephContext* cct, string type, else if (type == "2q") c = new TwoQCache(cct); else - ceph_assert(0 == "unrecognized cache type"); + ceph_abort_msg("unrecognized cache type"); c->logger = logger; return c; @@ -925,7 +925,7 @@ void BlueStore::TwoQCache::_add_buffer(Buffer *b, int level, Buffer *near) buffer_hot.insert(buffer_hot.iterator_to(*near), *b); break; default: - ceph_assert(0 == "bad cache_private"); + ceph_abort_msg("bad cache_private"); } } else if (b->cache_private == BUFFER_NEW) { b->cache_private = BUFFER_WARM_IN; @@ -952,7 +952,7 @@ void BlueStore::TwoQCache::_add_buffer(Buffer *b, int level, Buffer *near) buffer_hot.push_front(*b); break; default: - ceph_assert(0 == "bad cache_private"); + ceph_abort_msg("bad cache_private"); } } if (!b->is_empty()) { @@ -981,7 +981,7 @@ void BlueStore::TwoQCache::_rm_buffer(Buffer *b) buffer_hot.erase(buffer_hot.iterator_to(*b)); break; default: - ceph_assert(0 == "bad cache_private"); + ceph_abort_msg("bad cache_private"); } } @@ -1005,7 +1005,7 @@ void BlueStore::TwoQCache::_move_buffer(Cache *srcc, Buffer *b) buffer_hot.push_back(*b); break; default: - ceph_assert(0 == "bad cache_private"); + ceph_abort_msg("bad cache_private"); } if (!b->is_empty()) { buffer_bytes += b->length; @@ -2178,7 +2178,7 @@ bid_t BlueStore::ExtentMap::allocate_spanning_blob_id() if (bid < 0) bid = 0; } } while (bid != begin_bid); - ceph_assert(0 == "no available blob id"); + ceph_abort_msg("no available blob id"); } void BlueStore::ExtentMap::reshard( @@ -2779,7 +2779,7 @@ void BlueStore::ExtentMap::dirty_range( derr << __func__ << "on write 0x" << std::hex << offset << "~" << length << " shard 0x" << p->shard_info->offset << std::dec << " is not loaded, can't mark dirty" << dendl; - ceph_assert(0 == "can't mark unloaded shard dirty"); + ceph_abort_msg("can't mark unloaded shard dirty"); } if (!p->dirty) { dout(20) << __func__ << " mark shard 0x" << std::hex @@ -3252,7 +3252,7 @@ void BlueStore::Collection::load_shared_blob(SharedBlobRef sb) lderr(store->cct) << __func__ << " sbid 0x" << std::hex << sbid << std::dec << " not found at key " << pretty_binary_string(key) << dendl; - ceph_assert(0 == "uh oh, missing shared_blob"); + ceph_abort_msg("uh oh, missing shared_blob"); } sb->loaded = true; @@ -6660,7 +6660,7 @@ int BlueStore::_fsck(bool deep, bool repair) if (r < 0) { derr << __func__ << " failed to read from 0x" << std::hex << e->offset <<"~" << e->length << std::dec << dendl; - ceph_assert(0 == "read failed, wtf"); + ceph_abort_msg("read failed, wtf"); } pext_to_release.push_back(*e); e = pextents.erase(e); @@ -8421,7 +8421,7 @@ int BlueStore::_open_super_meta() freelist_type = std::string(bl.c_str(), bl.length()); dout(10) << __func__ << " freelist_type " << freelist_type << dendl; } else { - ceph_assert("Not Support extent freelist manager" == 0); + ceph_abort_msg("Not Support extent freelist manager"); } } @@ -8732,7 +8732,7 @@ void BlueStore::_txc_state_proc(TransContext *txc) default: derr << __func__ << " unexpected txc " << txc << " state " << txc->get_state_name() << dendl; - ceph_assert(0 == "unexpected txc state"); + ceph_abort_msg("unexpected txc state"); return; } } @@ -9845,7 +9845,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_SPLIT_COLLECTION: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_SPLIT_COLLECTION2: @@ -9889,7 +9889,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_COLL_RENAME: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; } if (r < 0) { @@ -9897,7 +9897,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) << " not handled on operation " << op->op << " (op " << pos << ", counting from 0)" << dendl; _dump_transaction<0>(t); - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } // these operations implicity create the object @@ -10007,7 +10007,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_CLONERANGE: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_CLONERANGE2: @@ -10025,15 +10025,15 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_COLL_ADD: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; case Transaction::OP_COLL_REMOVE: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; case Transaction::OP_COLL_MOVE: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_COLL_MOVE_RENAME: @@ -10141,7 +10141,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) << dendl; derr << msg << dendl; _dump_transaction<0>(t); - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } } } diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index ae776a099e080..ff814de5e5c5d 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -1279,7 +1279,7 @@ public: break; case BUFFER_WARM_OUT: // move from warm_out to hot LRU - ceph_assert(0 == "this happens via discard hint"); + ceph_abort_msg("this happens via discard hint"); break; case BUFFER_HOT: // move to front of hot LRU diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc index e3c075bbaf2fa..1d6148bdcadd4 100644 --- a/src/os/bluestore/KernelDevice.cc +++ b/src/os/bluestore/KernelDevice.cc @@ -83,7 +83,7 @@ int KernelDevice::open(const string& p) dio = true; aio = cct->_conf->bdev_aio; if (!aio) { - ceph_assert(0 == "non-aio not supported"); + ceph_abort_msg("non-aio not supported"); } // disable readahead as it will wreak havoc on our mix of @@ -430,7 +430,7 @@ void KernelDevice::_aio_thread() aio, max); if (r < 0) { derr << __func__ << " got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "got unexpected error from io_getevents"); + ceph_abort_msg("got unexpected error from io_getevents"); } if (r > 0) { dout(30) << __func__ << " got " << r << " completed aios" << dendl; @@ -465,7 +465,7 @@ void KernelDevice::_aio_thread() } else if (aio[i]->length != (uint64_t)r) { derr << "aio to " << aio[i]->offset << "~" << aio[i]->length << " but returned: " << r << dendl; - ceph_assert(0 == "unexpected aio error"); + ceph_abort_msg("unexpected aio error"); } dout(10) << __func__ << " finished aio " << aio[i] << " r " << r @@ -499,7 +499,7 @@ void KernelDevice::_aio_thread() << " since " << debug_stall_since << ", timeout is " << cct->_conf->bdev_debug_aio_suicide_timeout << "s, suicide" << dendl; - ceph_assert(0 == "stalled aio... buggy kernel or bad device?"); + ceph_abort_msg("stalled aio... buggy kernel or bad device?"); } } } diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc index 8597c75022187..93dbe41de2948 100644 --- a/src/os/bluestore/bluestore_types.cc +++ b/src/os/bluestore/bluestore_types.cc @@ -107,9 +107,9 @@ void bluestore_extent_ref_map_t::_check() const unsigned refs = 0; for (const auto &p : ref_map) { if (p.first < pos) - ceph_assert(0 == "overlap"); + ceph_abort_msg("overlap"); if (p.first == pos && p.second.refs == refs) - ceph_assert(0 == "unmerged"); + ceph_abort_msg("unmerged"); pos = p.first + p.second.length; refs = p.second.refs; } @@ -197,11 +197,11 @@ void bluestore_extent_ref_map_t::put( auto p = ref_map.lower_bound(offset); if (p == ref_map.end() || p->first > offset) { if (p == ref_map.begin()) { - ceph_assert(0 == "put on missing extent (nothing before)"); + ceph_abort_msg("put on missing extent (nothing before)"); } --p; if (p->first + p->second.length <= offset) { - ceph_assert(0 == "put on missing extent (gap)"); + ceph_abort_msg("put on missing extent (gap)"); } } if (p->first < offset) { diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h index 405a33bcaaa02..e83d32622fc99 100644 --- a/src/os/bluestore/bluestore_types.h +++ b/src/os/bluestore/bluestore_types.h @@ -601,7 +601,7 @@ public: b_len -= p->length; ++p; } - ceph_assert(0 == "we should not get here"); + ceph_abort_msg("we should not get here"); return false; } @@ -743,7 +743,7 @@ public: const char *p = csum_data.c_str(); switch (cs) { case 0: - ceph_assert(0 == "no csum data, bad index"); + ceph_abort_msg("no csum data, bad index"); case 1: return reinterpret_cast(p)[i]; case 2: @@ -753,7 +753,7 @@ public: case 8: return reinterpret_cast(p)[i]; default: - ceph_assert(0 == "unrecognized csum word size"); + ceph_abort_msg("unrecognized csum word size"); } } const char *get_csum_item_ptr(unsigned i) const { diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc index 3006cfc28ca62..cfb1692cf3547 100644 --- a/src/os/filestore/FileJournal.cc +++ b/src/os/filestore/FileJournal.cc @@ -983,7 +983,7 @@ void FileJournal::check_align(off64_t pos, bufferlist& bl) if (directio && !bl.is_aligned_size_and_memory(block_size, CEPH_DIRECTIO_ALIGNMENT)) { ceph_assert((bl.length() & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0); ceph_assert((pos & (CEPH_DIRECTIO_ALIGNMENT - 1)) == 0); - ceph_assert(0 == "bl was not aligned"); + ceph_abort_msg("bl was not aligned"); } } @@ -1421,7 +1421,7 @@ int FileJournal::write_aio_bl(off64_t& pos, bufferlist& bl, uint64_t seq) continue; } check_align(pos, tbl); - ceph_assert(0 == "io_submit got unexpected error"); + ceph_abort_msg("io_submit got unexpected error"); } else { break; } @@ -1460,7 +1460,7 @@ void FileJournal::write_finish_thread_entry() continue; } derr << "io_getevents got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "got unexpected error from io_getevents"); + ceph_abort_msg("got unexpected error from io_getevents"); } { @@ -1470,7 +1470,7 @@ void FileJournal::write_finish_thread_entry() if (event[i].res != ai->len) { derr << "aio to " << ai->off << "~" << ai->len << " returned: " << (int)event[i].res << dendl; - ceph_assert(0 == "unexpected aio error"); + ceph_abort_msg("unexpected aio error"); } dout(10) << __func__ << " aio " << ai->off << "~" << ai->len << " done" << dendl; diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index 3755e4807ffba..43f05f444994a 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -2447,12 +2447,12 @@ void FileStore::_set_global_replay_guard(const coll_t& cid, int ret = object_map->sync(); if (ret < 0) { derr << __FUNC__ << ": omap sync error " << cpp_strerror(ret) << dendl; - ceph_assert(0 == "_set_global_replay_guard failed"); + ceph_abort_msg("_set_global_replay_guard failed"); } ret = sync_filesystem(basedir_fd); if (ret < 0) { derr << __FUNC__ << ": sync_filesystem error " << cpp_strerror(ret) << dendl; - ceph_assert(0 == "_set_global_replay_guard failed"); + ceph_abort_msg("_set_global_replay_guard failed"); } char fn[PATH_MAX]; @@ -2461,7 +2461,7 @@ void FileStore::_set_global_replay_guard(const coll_t& cid, if (fd < 0) { int err = errno; derr << __FUNC__ << ": " << cid << " error " << cpp_strerror(err) << dendl; - ceph_assert(0 == "_set_global_replay_guard failed"); + ceph_abort_msg("_set_global_replay_guard failed"); } _inject_failure(); @@ -2474,7 +2474,7 @@ void FileStore::_set_global_replay_guard(const coll_t& cid, if (r < 0) { derr << __FUNC__ << ": fsetxattr " << GLOBAL_REPLAY_GUARD_XATTR << " got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "fsetxattr failed"); + ceph_abort_msg("fsetxattr failed"); } // and make sure our xattr is durable. @@ -2527,7 +2527,7 @@ void FileStore::_set_replay_guard(const coll_t& cid, if (fd < 0) { int err = errno; derr << __FUNC__ << ": " << cid << " error " << cpp_strerror(err) << dendl; - ceph_assert(0 == "_set_replay_guard failed"); + ceph_abort_msg("_set_replay_guard failed"); } _set_replay_guard(fd, spos, 0, in_progress); VOID_TEMP_FAILURE_RETRY(::close(fd)); @@ -2566,7 +2566,7 @@ void FileStore::_set_replay_guard(int fd, fd, REPLAY_GUARD_XATTR, v.c_str(), v.length()); if (r < 0) { derr << "fsetxattr " << REPLAY_GUARD_XATTR << " got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "fsetxattr failed"); + ceph_abort_msg("fsetxattr failed"); } // and make sure our xattr is durable. @@ -2586,7 +2586,7 @@ void FileStore::_close_replay_guard(const coll_t& cid, if (fd < 0) { int err = errno; derr << __FUNC__ << ": " << cid << " error " << cpp_strerror(err) << dendl; - ceph_assert(0 == "_close_replay_guard failed"); + ceph_abort_msg("_close_replay_guard failed"); } _close_replay_guard(fd, spos); VOID_TEMP_FAILURE_RETRY(::close(fd)); @@ -2616,7 +2616,7 @@ void FileStore::_close_replay_guard(int fd, const SequencerPosition& spos, fd, REPLAY_GUARD_XATTR, v.c_str(), v.length()); if (r < 0) { derr << "fsetxattr " << REPLAY_GUARD_XATTR << " got " << cpp_strerror(r) << dendl; - ceph_assert(0 == "fsetxattr failed"); + ceph_abort_msg("fsetxattr failed"); } // and make sure our xattr is durable. @@ -3049,7 +3049,7 @@ void FileStore::_do_transaction( case Transaction::OP_COLL_SETATTR: case Transaction::OP_COLL_RMATTR: - ceph_assert(0 == "collection attr methods no longer implemented"); + ceph_abort_msg("collection attr methods no longer implemented"); break; case Transaction::OP_COLL_RENAME: @@ -3129,7 +3129,7 @@ void FileStore::_do_transaction( break; case Transaction::OP_SPLIT_COLLECTION: { - ceph_assert(0 == "not legacy journal; upgrade to firefly first"); + ceph_abort_msg("not legacy journal; upgrade to firefly first"); } break; case Transaction::OP_SPLIT_COLLECTION2: @@ -3248,7 +3248,7 @@ void FileStore::_do_transaction( dump_open_fds(cct); } - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } } @@ -3373,7 +3373,7 @@ int FileStore::read( if (errors != 0) { dout(0) << __FUNC__ << ": " << cid << "/" << oid << " " << offset << "~" << got << " ... BAD CRC:\n" << ss.str() << dendl; - ceph_assert(0 == "bad crc on read"); + ceph_abort_msg("bad crc on read"); } } @@ -4127,7 +4127,7 @@ void FileStore::sync_entry() int err = write_op_seq(op_fd, cp); if (err < 0) { derr << "Error during write_op_seq: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error during write_op_seq"); + ceph_abort_msg("error during write_op_seq"); } char s[NAME_MAX]; @@ -4149,7 +4149,7 @@ void FileStore::sync_entry() err = backend->sync_checkpoint(cid); if (err < 0) { derr << "ioctl WAIT_SYNC got " << cpp_strerror(err) << dendl; - ceph_assert(0 == "wait_sync got error"); + ceph_abort_msg("wait_sync got error"); } dout(20) << " done waiting for checkpoint " << cid << " to complete" << dendl; } @@ -4160,24 +4160,24 @@ void FileStore::sync_entry() int err = object_map->sync(); if (err < 0) { derr << "object_map sync got " << cpp_strerror(err) << dendl; - ceph_assert(0 == "object_map sync returned error"); + ceph_abort_msg("object_map sync returned error"); } err = backend->syncfs(); if (err < 0) { derr << "syncfs got " << cpp_strerror(err) << dendl; - ceph_assert(0 == "syncfs returned error"); + ceph_abort_msg("syncfs returned error"); } err = write_op_seq(op_fd, cp); if (err < 0) { derr << "Error during write_op_seq: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error during write_op_seq"); + ceph_abort_msg("error during write_op_seq"); } err = ::fsync(op_fd); if (err < 0) { derr << "Error during fsync of op_seq: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error during fsync of op_seq"); + ceph_abort_msg("error during fsync of op_seq"); } } @@ -4912,7 +4912,7 @@ int FileStore::list_collections(vector& ls, bool include_temp) if (int n = snprintf(filename, sizeof(filename), "%s/%s", fn, de->d_name); n >= static_cast(sizeof(filename))) { derr << __func__ << " path length overrun: " << n << dendl; - ceph_assert(false); + ceph_abort(); } r = ::stat(filename, &sb); @@ -5536,7 +5536,7 @@ int FileStore::_collection_move_rename(const coll_t& oldcid, const ghobject_t& o << oldcid << "/" << oldoid << " (dne, ignoring enoent)" << dendl; } else { - ceph_assert(0 == "ERROR: source must exist"); + ceph_abort_msg("ERROR: source must exist"); } if (!replaying) { diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc index 7e2b5728c572c..714d0935608ac 100644 --- a/src/os/filestore/JournalingObjectStore.cc +++ b/src/os/filestore/JournalingObjectStore.cc @@ -170,7 +170,7 @@ void JournalingObjectStore::SubmitManager::op_submit_finish(uint64_t op) if (op != op_submitted + 1) { dout(0) << "op_submit_finish " << op << " expected " << (op_submitted + 1) << ", OUT OF ORDER" << dendl; - ceph_assert(0 == "out of order op_submit_finish"); + ceph_abort_msg("out of order op_submit_finish"); } op_submitted = op; lock.Unlock(); diff --git a/src/os/filestore/WBThrottle.cc b/src/os/filestore/WBThrottle.cc index e2a5d36c72336..4ce5256ab7d17 100644 --- a/src/os/filestore/WBThrottle.cc +++ b/src/os/filestore/WBThrottle.cc @@ -113,7 +113,7 @@ void WBThrottle::set_from_conf() fd_limits.second = cct->_conf->filestore_wbthrottle_xfs_inodes_hard_limit; } else { - ceph_assert(0 == "invalid value for fs"); + ceph_abort_msg("invalid value for fs"); } cond.Signal(); } diff --git a/src/os/filestore/chain_xattr.cc b/src/os/filestore/chain_xattr.cc index aa9ce2502fb02..8d63f1d37ad0d 100644 --- a/src/os/filestore/chain_xattr.cc +++ b/src/os/filestore/chain_xattr.cc @@ -188,7 +188,7 @@ int chain_getxattr_buf(const char *fn, const char *name, bufferptr *bp) } } } - ceph_assert(0 == "unreachable"); + ceph_abort_msg("unreachable"); return 0; } diff --git a/src/os/fs/FS.cc b/src/os/fs/FS.cc index a530b54ab11b0..c40fd0deda395 100644 --- a/src/os/fs/FS.cc +++ b/src/os/fs/FS.cc @@ -113,7 +113,7 @@ int FS::copy_file_range(int to_fd, uint64_t to_offset, int from_fd, uint64_t from_offset, uint64_t from_len) { - ceph_assert(0 == "write me"); + ceph_abort_msg("write me"); } int FS::zero(int fd, uint64_t offset, uint64_t length) diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc index ba1a3127adf5a..b9d7c121d2100 100644 --- a/src/os/kstore/KStore.cc +++ b/src/os/kstore/KStore.cc @@ -1970,7 +1970,7 @@ void KStore::_txc_state_proc(TransContext *txc) default: derr << __func__ << " unexpected txc " << txc << " state " << txc->get_state_name() << dendl; - ceph_assert(0 == "unexpected txc state"); + ceph_abort_msg("unexpected txc state"); return; } } @@ -2231,7 +2231,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_SPLIT_COLLECTION: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_SPLIT_COLLECTION2: @@ -2275,7 +2275,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_COLL_RENAME: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; } if (r < 0) { @@ -2289,7 +2289,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) f.close_section(); f.flush(*_dout); *_dout << dendl; - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } // object operations @@ -2397,7 +2397,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_CLONERANGE: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_CLONERANGE2: @@ -2412,15 +2412,15 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) break; case Transaction::OP_COLL_ADD: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; case Transaction::OP_COLL_REMOVE: - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); break; case Transaction::OP_COLL_MOVE: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_COLL_MOVE_RENAME: @@ -2536,7 +2536,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) f.close_section(); f.flush(*_dout); *_dout << dendl; - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } } } diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index ca384b8c7609f..199af45ab6a4a 100644 --- a/src/os/memstore/MemStore.cc +++ b/src/os/memstore/MemStore.cc @@ -840,7 +840,7 @@ void MemStore::_do_transaction(Transaction& t) break; case Transaction::OP_COLL_MOVE: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_COLL_MOVE_RENAME: @@ -868,19 +868,19 @@ void MemStore::_do_transaction(Transaction& t) case Transaction::OP_COLL_SETATTR: { - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); } break; case Transaction::OP_COLL_RMATTR: { - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); } break; case Transaction::OP_COLL_RENAME: { - ceph_assert(0 == "not implemented"); + ceph_abort_msg("not implemented"); } break; @@ -929,7 +929,7 @@ void MemStore::_do_transaction(Transaction& t) } break; case Transaction::OP_SPLIT_COLLECTION: - ceph_assert(0 == "deprecated"); + ceph_abort_msg("deprecated"); break; case Transaction::OP_SPLIT_COLLECTION2: { @@ -992,7 +992,7 @@ void MemStore::_do_transaction(Transaction& t) f.close_section(); f.flush(*_dout); *_dout << dendl; - ceph_assert(0 == "unexpected error"); + ceph_abort_msg("unexpected error"); } } diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index eba12bec67748..9288bd94f4cdf 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -46,7 +46,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::pipeline_state_t &rhs) { case ECBackend::pipeline_state_t::CACHE_INVALID: return lhs << "CACHE_INVALID"; default: - ceph_assert(0 == "invalid pipeline state"); + ceph_abort_msg("invalid pipeline state"); } return lhs; // unreachable } @@ -726,7 +726,7 @@ int ECBackend::recover_object( ceph_assert(head->ssc); h->ops.back().recovery_info.ss = head->ssc->snapset; } else { - ceph_assert(0 == "neither obc nor head set for a snap object"); + ceph_abort_msg("neither obc nor head set for a snap object"); } } h->ops.back().recovery_progress.omap_complete = true; diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 7e9ef685648e0..f5a47e3b06486 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -524,7 +524,7 @@ void OSDService::agent_stop() if (!agent_queue.empty()) { set& top = agent_queue.rbegin()->second; derr << "agent queue not empty, for example " << (*top.begin())->get_pgid() << dendl; - ceph_assert(0 == "agent queue not empty"); + ceph_abort_msg("agent queue not empty"); } agent_stop_flag = true; @@ -2253,7 +2253,7 @@ will start to track new ops received afterwards."; } f->close_section(); } else { - ceph_assert(0 == "broken asok registration"); + ceph_abort_msg("broken asok registration"); } f->flush(ss); delete f; @@ -3850,7 +3850,7 @@ void OSD::load_pgs() derr << __func__ << ": have pgid " << pgid << " at epoch " << map_epoch << ", but missing map. Crashing." << dendl; - ceph_assert(0 == "Missing map in load_pgs"); + ceph_abort_msg("Missing map in load_pgs"); } } pg = _make_pg(pgosdmap, pgid); @@ -7342,7 +7342,7 @@ void OSD::handle_osd_map(MOSDMap *m) inc.decode(p); if (o->apply_incremental(inc) < 0) { derr << "ERROR: bad fsid? i have " << osdmap->get_fsid() << " and inc has " << inc.fsid << dendl; - ceph_assert(0 == "bad fsid"); + ceph_abort_msg("bad fsid"); } bufferlist fbl; @@ -7377,7 +7377,7 @@ void OSD::handle_osd_map(MOSDMap *m) continue; } - ceph_assert(0 == "MOSDMap lied about what maps it had?"); + ceph_abort_msg("MOSDMap lied about what maps it had?"); } // even if this map isn't from a mon, we may have satisfied our subscription diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 89fcf4cc1792d..2c96b7068b649 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -4029,7 +4029,7 @@ int OSDMap::summarize_mapping_stats( } } } else { - ceph_assert(0 == "unhandled pool type"); + ceph_abort_msg("unhandled pool type"); } } } diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 00448f6bf98d7..cc6845678dd17 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -929,7 +929,7 @@ void PG::check_past_interval_bounds() const derr << info.pgid << " past_intervals [" << apib << ") start interval does not contain the required" << " bound [" << rpib << ") start" << dendl; - ceph_assert(0 == "past_interval start interval mismatch"); + ceph_abort_msg("past_interval start interval mismatch"); } if (apib.second != rpib.second) { osd->clog->error() << info.pgid << " past_interal bound [" << apib @@ -938,7 +938,7 @@ void PG::check_past_interval_bounds() const derr << info.pgid << " past_interal bound [" << apib << ") end does not match required [" << rpib << ") end" << dendl; - ceph_assert(0 == "past_interval end mismatch"); + ceph_abort_msg("past_interval end mismatch"); } } } @@ -3738,7 +3738,7 @@ void PG::read_state(ObjectStore *store) if (info_struct_v < compat_struct_v) { derr << "PG needs upgrade, but on-disk data is too old; upgrade to" << " an older version first." << dendl; - ceph_assert(0 == "PG too old to upgrade"); + ceph_abort_msg("PG too old to upgrade"); } last_written_info = info; @@ -4622,7 +4622,7 @@ void PG::repair_object( decode(oi, bliter); } catch (...) { dout(0) << __func__ << ": Need version of replica, bad object_info_t: " << soid << dendl; - ceph_assert(0); + ceph_abort(); } if (bad_peer != primary) { peer_missing[bad_peer].add(soid, oi.version, eversion_t(), false); @@ -6608,7 +6608,7 @@ PG::RecoveryState::Crashed::Crashed(my_context ctx) NamedState(context< RecoveryMachine >().pg, "Crashed") { context< RecoveryMachine >().log_enter(state_name); - ceph_assert(0 == "we got a bad state machine event"); + ceph_abort_msg("we got a bad state machine event"); } diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index de85388750a38..2c1c79444f8f7 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -299,7 +299,7 @@ public: return true; } } - ceph_assert(0 == "in extra_caller_ops but not extra_reqids"); + ceph_abort_msg("in extra_caller_ops but not extra_reqids"); } if (!(indexed_data & PGLOG_INDEXED_DUPS)) { @@ -1440,7 +1440,7 @@ public: << i.first << " " << i.second << " last_backfill = " << info.last_backfill << dendl; - ceph_assert(0 == "invalid missing set entry found"); + ceph_abort_msg("invalid missing set entry found"); } bufferlist bv; int r = store->getattr( diff --git a/src/osd/PGTransaction.h b/src/osd/PGTransaction.h index 4c1f8307ead5d..e3a7b8e1e8206 100644 --- a/src/osd/PGTransaction.h +++ b/src/osd/PGTransaction.h @@ -234,7 +234,7 @@ public: return BufferUpdate::Zero{z.len + r->len}; }, [&](const BufferUpdate::CloneRange &c) -> BufferUpdateType { - ceph_assert(0 == "violates can_merge condition"); + ceph_abort_msg("violates can_merge condition"); return left; }); } diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 29869c0e19e02..0ef84b73747bd 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -1874,7 +1874,7 @@ void PrimaryLogPG::do_request( break; default: - ceph_assert(0 == "bad message type in do_request"); + ceph_abort_msg("bad message type in do_request"); } } @@ -2491,7 +2491,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_manifest_detail( return cache_result_t::NOOP; } default: - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } return cache_result_t::NOOP; @@ -2830,7 +2830,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail( return cache_result_t::HANDLED_PROXY; } - ceph_assert(0 == "unreachable"); + ceph_abort_msg("unreachable"); return cache_result_t::NOOP; case pg_pool_t::CACHEMODE_FORWARD: @@ -2907,7 +2907,7 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_cache_detail( return cache_result_t::HANDLED_PROXY; default: - ceph_assert(0 == "unrecognized cache_mode"); + ceph_abort_msg("unrecognized cache_mode"); } return cache_result_t::NOOP; } @@ -3082,7 +3082,7 @@ void PrimaryLogPG::do_proxy_read(OpRequestRef op, ObjectContextRef obc) soid = obc->obs.oi.manifest.redirect_target; break; default: - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } } else { /* proxy */ @@ -3297,7 +3297,7 @@ void PrimaryLogPG::do_proxy_write(OpRequestRef op, ObjectContextRef obc) soid = obc->obs.oi.manifest.redirect_target; break; default: - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } } else { /* proxy */ @@ -3510,7 +3510,7 @@ void PrimaryLogPG::do_proxy_chunked_read(OpRequestRef op, ObjectContextRef obc, if (chunk_index <= req_offset) { osd_op.op.extent.offset = manifest->chunk_map[chunk_index].offset + req_offset - chunk_index; } else { - ceph_assert(0 == "chunk_index > req_offset"); + ceph_abort_msg("chunk_index > req_offset"); } osd_op.op.extent.length = req_length; @@ -3728,7 +3728,7 @@ struct PromoteFinisher : public PrimaryLogPG::OpFinisher { promote_callback->promote_results.get<1>(), promote_callback->obc); } else { - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } return 0; } @@ -3791,7 +3791,7 @@ void PrimaryLogPG::promote_object(ObjectContextRef obc, src_hoid = obc->obs.oi.manifest.redirect_target; cb = new PromoteCallback(obc, this); } else { - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } } @@ -3950,7 +3950,7 @@ void PrimaryLogPG::execute_ctx(OpContext *ctx) dout(20) << " op order client." << n << " tid " << t << " last was " << p->second << dendl; if (p->second > t) { derr << "bad op order, already applied " << p->second << " > this " << t << dendl; - ceph_assert(0 == "out of order op"); + ceph_abort_msg("out of order op"); } p->second = t; } @@ -6973,7 +6973,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) src_hoid = obs.oi.manifest.redirect_target; cb = new PromoteManifestCallback(ctx->obc, this, ctx); } else { - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } ctx->op_finishers[ctx->current_osd_subop_num].reset( new PromoteFinisher(cb)); @@ -7038,7 +7038,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) } }); } else { - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } oi.clear_flag(object_info_t::FLAG_MANIFEST); @@ -7839,9 +7839,9 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op) block_write_on_full_cache(soid, ctx->op); return -EAGAIN; case cache_result_t::REPLIED_WITH_EAGAIN: - ceph_assert(0 == "this can't happen, no rollback on replica"); + ceph_abort_msg("this can't happen, no rollback on replica"); default: - ceph_assert(0 == "must promote was set, other values are not valid"); + ceph_abort_msg("must promote was set, other values are not valid"); return -EAGAIN; } } @@ -7860,7 +7860,7 @@ int PrimaryLogPG::_rollback_to(OpContext *ctx, ceph_osd_op& op) } } else if (ret) { // ummm....huh? It *can't* return anything else at time of writing. - ceph_assert(0 == "unexpected error code in _rollback_to"); + ceph_abort_msg("unexpected error code in _rollback_to"); } else { //we got our context, let's use it to do the rollback! hobject_t& rollback_to_sobject = rollback_to->obs.oi.soid; if (is_degraded_or_backfilling_object(rollback_to_sobject) || @@ -8810,7 +8810,7 @@ void PrimaryLogPG::start_copy(CopyCallback *cb, ObjectContextRef obc, auto p = obc->obs.oi.manifest.chunk_map.begin(); _copy_some_manifest(obc, cop, p->first); } else { - ceph_assert(0 == "unrecognized manifest type"); + ceph_abort_msg("unrecognized manifest type"); } } } @@ -9517,7 +9517,7 @@ void PrimaryLogPG::finish_promote(int r, CopyResults *results, if (!tctx->lock_manager.take_write_lock( head, obc)) { - ceph_assert(0 == "problem!"); + ceph_abort_msg("problem!"); } dout(20) << __func__ << " took lock on obc, " << obc->rwstate << dendl; @@ -9623,7 +9623,7 @@ void PrimaryLogPG::finish_promote(int r, CopyResults *results, if (!tctx->lock_manager.take_write_lock( obc->obs.oi.soid, obc)) { - ceph_assert(0 == "problem!"); + ceph_abort_msg("problem!"); } dout(20) << __func__ << " took lock on obc, " << obc->rwstate << dendl; @@ -11692,7 +11692,7 @@ void PrimaryLogPG::mark_all_unfound_lost( switch (what) { case pg_log_entry_t::LOST_MARK: - ceph_assert(0 == "actually, not implemented yet!"); + ceph_abort_msg("actually, not implemented yet!"); break; case pg_log_entry_t::LOST_REVERT: @@ -13292,7 +13292,7 @@ void PrimaryLogPG::update_range( projected_log.scan_log_after(bi->version, func); bi->version = projected_last_update; } else { - ceph_assert(0 == "scan_range should have raised bi->version past log_tail"); + ceph_abort_msg("scan_range should have raised bi->version past log_tail"); } } @@ -13372,7 +13372,7 @@ void PrimaryLogPG::check_local() if (r != -ENOENT) { derr << __func__ << " " << p->soid << " exists, but should have been " << "deleted" << dendl; - ceph_assert(0 == "erroneously present object"); + ceph_abort_msg("erroneously present object"); } } else { // ignore old(+missing) objects @@ -15180,7 +15180,7 @@ boost::statechart::result PrimaryLogPG::AwaitAsyncWork::react(const DoSnapWork&) if (r != 0 && r != -ENOENT) { lderr(pg->cct) << "get_next_objects_to_trim returned " << cpp_strerror(r) << dendl; - ceph_assert(0 == "get_next_objects_to_trim returned an invalid code"); + ceph_abort_msg("get_next_objects_to_trim returned an invalid code"); } else if (r == -ENOENT) { // Done! ldout(pg->cct, 10) << "got ENOENT" << dendl; diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index 0b20d9ca5e037..76546ea391fa5 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -93,7 +93,7 @@ static void log_subop_stats( logger->inc(l_osd_sop_push_inb, inb); logger->tinc(l_osd_sop_push_lat, latency); } else - ceph_assert("no support subop" == 0); + ceph_abort_msg("no support subop"); } else { logger->tinc(l_osd_sop_pull_lat, latency); } @@ -261,7 +261,7 @@ void ReplicatedBackend::objects_read_async( Context *on_complete, bool fast_read) { - ceph_assert(0 == "async read is not used by replica pool"); + ceph_abort_msg("async read is not used by replica pool"); } class C_OSD_OnOpCommit : public Context { diff --git a/src/osd/TierAgentState.h b/src/osd/TierAgentState.h index 5372685b78e83..2c58534b1c2da 100644 --- a/src/osd/TierAgentState.h +++ b/src/osd/TierAgentState.h @@ -42,7 +42,7 @@ struct TierAgentState { case FLUSH_MODE_IDLE: return "idle"; case FLUSH_MODE_LOW: return "low"; case FLUSH_MODE_HIGH: return "high"; - default: ceph_assert(0 == "bad flush mode"); + default: ceph_abort_msg("bad flush mode"); } } const char *get_flush_mode_name() const { @@ -59,7 +59,7 @@ struct TierAgentState { case EVICT_MODE_IDLE: return "idle"; case EVICT_MODE_SOME: return "some"; case EVICT_MODE_FULL: return "full"; - default: ceph_assert(0 == "bad evict mode"); + default: ceph_abort_msg("bad evict mode"); } } const char *get_evict_mode_name() const { diff --git a/src/osd/osd_internal_types.h b/src/osd/osd_internal_types.h index 775cdf7a646ce..97d444e7ea74b 100644 --- a/src/osd/osd_internal_types.h +++ b/src/osd/osd_internal_types.h @@ -116,7 +116,7 @@ public: case RWEXCL: return false; default: - ceph_assert(0 == "unhandled case"); + ceph_abort_msg("unhandled case"); return false; } } @@ -150,7 +150,7 @@ public: case RWEXCL: return false; default: - ceph_assert(0 == "unhandled case"); + ceph_abort_msg("unhandled case"); return false; } } @@ -168,7 +168,7 @@ public: case RWEXCL: return false; default: - ceph_assert(0 == "unhandled case"); + ceph_abort_msg("unhandled case"); return false; } } @@ -230,7 +230,7 @@ public: case RWState::RWEXCL: return get_excl(op); default: - ceph_assert(0 == "invalid lock type"); + ceph_abort_msg("invalid lock type"); return true; } } @@ -277,7 +277,7 @@ public: rwstate.put_excl(to_wake); break; default: - ceph_assert(0 == "invalid lock type"); + ceph_abort_msg("invalid lock type"); } if (rwstate.empty() && rwstate.recovery_read_marker) { rwstate.recovery_read_marker = false; diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 93aa37f4e448b..fc30e99bf17d9 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -640,7 +640,7 @@ void coll_t::calc_str() _str = pgid.calc_name(_str_buff + spg_t::calc_name_buf_size - 1, "PMET_"); break; default: - ceph_assert(0 == "unknown collection type"); + ceph_abort_msg("unknown collection type"); } } @@ -3322,7 +3322,7 @@ void PastIntervals::decode(bufferlist::const_iterator &bl) case 0: break; case 1: - ceph_assert(0 == "pi_simple_rep support removed post-luminous"); + ceph_abort_msg("pi_simple_rep support removed post-luminous"); break; case 2: past_intervals.reset(new pi_compact_rep); @@ -3745,12 +3745,12 @@ void ObjectModDesc::visit(Visitor *visitor) const break; } default: - ceph_assert(0 == "Invalid rollback code"); + ceph_abort_msg("Invalid rollback code"); } DECODE_FINISH(bp); } } catch (...) { - ceph_assert(0 == "Invalid encoding"); + ceph_abort_msg("Invalid encoding"); } } diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 4156718b86ff7..455ff56d359ca 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1305,7 +1305,7 @@ struct pg_pool_t { case CACHEMODE_READPROXY: return true; default: - ceph_assert(0 == "implement me"); + ceph_abort_msg("implement me"); } } @@ -1532,7 +1532,7 @@ public: case TYPE_ERASURE: return false; default: - ceph_assert(0 == "unhandled pool type"); + ceph_abort_msg("unhandled pool type"); } } @@ -2693,7 +2693,7 @@ public: virtual void iterate_all_intervals( std::function &&f) const { ceph_assert(!has_full_intervals()); - ceph_assert(0 == "not valid for this implementation"); + ceph_abort_msg("not valid for this implementation"); } virtual ~interval_rep() {} diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index 7a80953e6b665..fe25e5c70e5a9 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -1392,7 +1392,7 @@ void Journaler::handle_write_error(int r) lderr(cct) << __func__ << ": multiple write errors, handler already called" << dendl; } else { - ceph_assert(0 == "unhandled write error"); + ceph_abort_msg("unhandled write error"); } } diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 3c2f0d3038ee4..c67b5f1c1a8c1 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -2631,7 +2631,7 @@ void ObjectCacher::bh_stat_add(BufferHead *bh) stat_error += bh->length(); break; default: - ceph_assert(0 == "bh_stat_add: invalid bufferhead state"); + ceph_abort_msg("bh_stat_add: invalid bufferhead state"); } if (get_stat_dirty_waiting() > 0) stat_cond.Signal(); @@ -2667,7 +2667,7 @@ void ObjectCacher::bh_stat_sub(BufferHead *bh) stat_error -= bh->length(); break; default: - ceph_assert(0 == "bh_stat_sub: invalid bufferhead state"); + ceph_abort_msg("bh_stat_sub: invalid bufferhead state"); } } diff --git a/src/perf_histogram.h b/src/perf_histogram.h index 9c5e1c1323423..c188852dca0be 100644 --- a/src/perf_histogram.h +++ b/src/perf_histogram.h @@ -21,7 +21,8 @@ #include #include #include -#include + +#include "include/assert.h" class PerfHistogramCommon { public: @@ -79,9 +80,10 @@ public: int i = 0; for (const auto &ac : axes_config) { - ceph_assert(ac.m_buckets > 0 && "Must have at least one bucket on axis"); - ceph_assert(ac.m_quant_size > 0 && - "Quantization unit must be non-zero positive integer value"); + ceph_assertf(ac.m_buckets > 0, + "Must have at least one bucket on axis"); + ceph_assertf(ac.m_quant_size > 0, + "Quantization unit must be non-zero positive integer value"); m_axes_config[i++] = ac; } @@ -178,8 +180,8 @@ protected: static_assert(sizeof...(T) == DIM, "Incorrect number of arguments"); return get_raw_index_internal<0>( [](int64_t bucket, const axis_config_d &ac) { - ceph_assert(bucket >= 0 && "Bucket index can not be negative"); - ceph_assert(bucket < ac.m_buckets && "Bucket index too large"); + ceph_assertf(bucket >= 0, "Bucket index can not be negative"); + ceph_assertf(bucket < ac.m_buckets, "Bucket index too large"); return bucket; }, 0, buckets...); diff --git a/src/test/admin_socket_output.cc b/src/test/admin_socket_output.cc index 7e6651a7c0a07..1302391c9cb3a 100644 --- a/src/test/admin_socket_output.cc +++ b/src/test/admin_socket_output.cc @@ -112,7 +112,7 @@ AdminSocketOutput::run_command(AdminSocketClient &client, if (!err.empty()) { std::cerr << __func__ << " AdminSocketClient::do_request errored with: " << err << std::endl; - ceph_assert(false); + ceph_abort(); } return std::make_pair(command, output); } diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc index 21eb62550aabf..48103ab996aca 100644 --- a/src/test/compressor/test_compression.cc +++ b/src/test/compressor/test_compression.cc @@ -47,7 +47,7 @@ public: g_conf().set_val("compressor_zlib_isal", "false"); g_ceph_context->_conf.apply_changes(nullptr); } else { - ceph_assert(0 == "bad option"); + ceph_abort_msg("bad option"); } } cout << "[plugin " << plugin << " (" << GetParam() << ")]" << std::endl; diff --git a/src/test/libcephfs/deleg.cc b/src/test/libcephfs/deleg.cc index 4c0d1c4922a64..2dc3b970213ab 100644 --- a/src/test/libcephfs/deleg.cc +++ b/src/test/libcephfs/deleg.cc @@ -134,7 +134,7 @@ static void namespace_breaker_func(struct ceph_mount_info *cmount, int cmd, cons break; default: // Bad command - ceph_assert(false); + ceph_abort(); } if (ret != -EAGAIN) break; diff --git a/src/test/librbd/test_mock_ManagedLock.cc b/src/test/librbd/test_mock_ManagedLock.cc index 0399fcd1480b6..b943f81c47ea1 100644 --- a/src/test/librbd/test_mock_ManagedLock.cc +++ b/src/test/librbd/test_mock_ManagedLock.cc @@ -106,11 +106,11 @@ struct GetLockerRequest { static GetLockerRequest* create(librados::IoCtx& ioctx, const std::string& oid, bool exclusive, Locker *locker, Context *on_finish) { - ceph_assert(0 == "unexpected call"); + ceph_abort_msg("unexpected call"); } void send() { - ceph_assert(0 == "unexpected call"); + ceph_abort_msg("unexpected call"); } }; @@ -121,11 +121,11 @@ struct BreakRequest { bool exclusive, bool blacklist_locker, uint32_t blacklist_expire_seconds, bool force_break_lock, Context *on_finish) { - ceph_assert(0 == "unexpected call"); + ceph_abort_msg("unexpected call"); } void send() { - ceph_assert(0 == "unexpected call"); + ceph_abort_msg("unexpected call"); } }; diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 92f16462c448c..772bc5def5300 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -556,7 +556,7 @@ class OSDStub : public TestStub if (pgs.count(pgid) == 0) { derr << __func__ << " pgid " << pgid << " not on our map" << dendl; - ceph_assert(0 == "pgid not on our map"); + ceph_abort_msg("pgid not on our map"); } pg_stat_t &s = pgs[pgid]; mstats->pg_stat[pgid] = s; @@ -847,7 +847,7 @@ class OSDStub : public TestStub derr << "osd." << whoami << "::" << __func__ << "** ERROR: applying incremental: " << cpp_strerror(err) << dendl; - ceph_assert(0 == "error applying incremental"); + ceph_abort_msg("error applying incremental"); } } dout(30) << __func__ << "\nosdmap:\n"; diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index 667f165e67e33..facf50d133959 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -1159,7 +1159,7 @@ class SyntheticWorkload { if (i++ % 50 == 0) print_internal_state(true); if (timeout_us < 0) - ceph_assert(0 == " loop time exceed 5 mins, it looks we stuck into some problems!"); + ceph_abort_msg(" loop time exceed 5 mins, it looks we stuck into some problems!"); } for (set::iterator it = available_servers.begin(); it != available_servers.end(); ++it) { diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc index ddff7a0170606..7a2bc9b6e513c 100644 --- a/src/test/objectstore/DeterministicOpSequence.cc +++ b/src/test/objectstore/DeterministicOpSequence.cc @@ -79,7 +79,7 @@ bool DeterministicOpSequence::run_one_op(int op, rngen_t& gen) default: cout << "bad op " << op << std::endl; - ceph_assert(0 == "bad op"); + ceph_abort_msg("bad op"); } return ok; } diff --git a/src/test/objectstore/TestObjectStoreState.cc b/src/test/objectstore/TestObjectStoreState.cc index 52d2ab60b7da7..19043856d5bae 100644 --- a/src/test/objectstore/TestObjectStoreState.cc +++ b/src/test/objectstore/TestObjectStoreState.cc @@ -293,5 +293,5 @@ int TestObjectStoreState::coll_entry_t::get_random_obj_id(rngen_t& gen) return it->first; } } - ceph_assert(0 == "INTERNAL ERROR"); + ceph_abort_msg("INTERNAL ERROR"); } diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 7213867192be5..fa6c0816d045a 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -4171,7 +4171,7 @@ public: cerr << "- " << *p << std::endl; //cerr << " objects_set: " << objects_set << std::endl; //cerr << " available_set: " << available_objects << std::endl; - ceph_assert(0 == "badness"); + ceph_abort_msg("badness"); } ASSERT_EQ(objects_set.size(), available_objects.size()); diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 11eab51ce7b0a..43dd2ae4de01f 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -929,7 +929,7 @@ public: cerr << "Error: racing read on " << oid << " returned version " << rcompletion->get_version64() << " rather than version " << version << std::endl; - ceph_assert(0 == "racing read got wrong version"); + ceph_abort_msg("racing read got wrong version"); } { @@ -1106,7 +1106,7 @@ public: cerr << "Error: racing read on " << oid << " returned version " << rcompletion->get_version64() << " rather than version " << version << std::endl; - ceph_assert(0 == "racing read got wrong version"); + ceph_abort_msg("racing read got wrong version"); } { @@ -1412,7 +1412,7 @@ public: } if (old_value.deleted()) { std::cout << num << ": expect deleted" << std::endl; - ceph_assert(0 == "expected deleted"); + ceph_abort_msg("expected deleted"); } else { std::cout << num << ": expect " << old_value.most_recent() << std::endl; } @@ -2162,7 +2162,7 @@ public: if (!retval) { if (old_value.deleted()) { std::cout << num << ": expect deleted" << std::endl; - ceph_assert(0 == "expected deleted"); + ceph_abort_msg("expected deleted"); } else { std::cout << num << ": expect " << old_value.most_recent() << std::endl; } @@ -2673,7 +2673,7 @@ public: if (r == 0) { // sucess } else { - ceph_assert(0 == "shouldn't happen"); + ceph_abort_msg("shouldn't happen"); } context->update_object_version(oid, completion->get_version64()); context->find_object(oid, &oid_value); @@ -3013,7 +3013,7 @@ public: } else if (r == -ENOENT) { // may have raced with a remove? } else { - ceph_assert(0 == "shouldn't happen"); + ceph_abort_msg("shouldn't happen"); } context->kick(); done = true; @@ -3099,7 +3099,7 @@ public: } else if (r == -ENOENT) { // may have raced with a remove? } else { - ceph_assert(0 == "shouldn't happen"); + ceph_abort_msg("shouldn't happen"); } context->kick(); done = true; diff --git a/src/test/rbd_mirror/image_map/test_Policy.cc b/src/test/rbd_mirror/image_map/test_Policy.cc index ad2f983401baf..4535ab7a59e28 100644 --- a/src/test/rbd_mirror/image_map/test_Policy.cc +++ b/src/test/rbd_mirror/image_map/test_Policy.cc @@ -29,7 +29,7 @@ public: if (policy_type == "none" || policy_type == "simple") { m_policy = image_map::SimplePolicy::create(m_local_io_ctx); } else { - ceph_assert(false); + ceph_abort(); } m_policy->init({}); diff --git a/src/test/signals.cc b/src/test/signals.cc index 6e40d0a362a83..42bd584b629e8 100644 --- a/src/test/signals.cc +++ b/src/test/signals.cc @@ -70,7 +70,7 @@ void testhandler(int signal) usr2 = true; break; default: - ceph_assert(0 == "unexpected signal"); + ceph_abort_msg("unexpected signal"); } } diff --git a/src/tools/rbd/action/Device.cc b/src/tools/rbd/action/Device.cc index 74137de7c1138..8d7ca5d9bd1c3 100644 --- a/src/tools/rbd/action/Device.cc +++ b/src/tools/rbd/action/Device.cc @@ -111,7 +111,7 @@ const DeviceOperations *get_device_operations(const po::variables_map &vm) { case DEVICE_TYPE_NBD: return &nbd_operations; default: - ceph_assert(0); + ceph_abort(); return nullptr; } } diff --git a/src/tools/rbd_mirror/ImageMap.cc b/src/tools/rbd_mirror/ImageMap.cc index 568f425940f2b..58fa5e03040ca 100644 --- a/src/tools/rbd_mirror/ImageMap.cc +++ b/src/tools/rbd_mirror/ImageMap.cc @@ -529,7 +529,7 @@ void ImageMap::init(Context *on_finish) { if (policy_type == "none" || policy_type == "simple") { m_policy.reset(image_map::SimplePolicy::create(m_ioctx)); } else { - ceph_assert(false); // not really needed as such, but catch it. + ceph_abort(); // not really needed as such, but catch it. } dout(20) << "mapping policy=" << policy_type << dendl; diff --git a/src/tools/rbd_mirror/image_map/Types.h b/src/tools/rbd_mirror/image_map/Types.h index eae5a3f4279a7..3b6b9b4530e05 100644 --- a/src/tools/rbd_mirror/image_map/Types.h +++ b/src/tools/rbd_mirror/image_map/Types.h @@ -87,7 +87,7 @@ struct PolicyMetaUnknown { } void encode(bufferlist& bl) const { - ceph_assert(false); + ceph_abort(); } void decode(__u8 version, bufferlist::const_iterator& it) { -- 2.39.5