From 26d37c4bc7abd37f30a4bc01f7345374a05446d8 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 23 Aug 2018 11:24:39 -0400 Subject: [PATCH] test: Use ceph_assert for asserts. Signed-off-by: Adam C. Emerson --- src/test/CMakeLists.txt | 3 + src/test/ObjectMap/KeyValueDBMemory.cc | 6 +- .../ObjectMap/test_keyvaluedb_atomicity.cc | 10 +- .../ObjectMap/test_keyvaluedb_iterators.cc | 4 +- src/test/ObjectMap/test_object_map.cc | 4 +- src/test/bufferlist.cc | 34 +-- src/test/ceph_compatset.cc | 3 - src/test/common/CMakeLists.txt | 4 +- src/test/common/ObjectContents.cc | 22 +- src/test/common/ObjectContents.h | 2 +- src/test/common/Throttle.cc | 4 +- src/test/common/test_sharedptr_registry.cc | 12 +- src/test/compressor/test_compression.cc | 2 +- src/test/crush/CrushWrapper.cc | 6 +- src/test/crush/crush.cc | 10 +- src/test/crypto.cc | 2 +- src/test/fio/fio_ceph_objectstore.cc | 14 +- src/test/journal/mock/MockJournaler.h | 6 +- src/test/journal/test_FutureImpl.cc | 2 +- src/test/kv_store_bench.cc | 4 +- src/test/libcephfs/deleg.cc | 4 +- src/test/librados/test_common.cc | 2 +- src/test/librados/tier.cc | 6 +- src/test/librados/watch_notify.cc | 10 +- .../librados_test_stub/LibradosTestStub.cc | 4 +- .../librados_test_stub/TestClassHandler.cc | 2 +- src/test/librados_test_stub/TestIoCtxImpl.cc | 2 +- src/test/librados_test_stub/TestMemCluster.cc | 6 +- .../librados_test_stub/TestMemIoCtxImpl.cc | 8 +- .../librados_test_stub/TestWatchNotify.cc | 10 +- src/test/librbd/CMakeLists.txt | 2 + .../deep_copy/test_mock_ImageCopyRequest.cc | 8 +- .../deep_copy/test_mock_ObjectCopyRequest.cc | 6 +- .../test_mock_SnapshotCopyRequest.cc | 4 +- .../test_mock_SnapshotCreateRequest.cc | 2 +- .../test_mock_PostAcquireRequest.cc | 2 +- src/test/librbd/fsx.cc | 26 +-- .../librbd/image/test_mock_CloneRequest.cc | 12 +- .../image/test_mock_DetachChildRequest.cc | 2 +- .../librbd/image/test_mock_RefreshRequest.cc | 6 +- .../librbd/image/test_mock_RemoveRequest.cc | 14 +- .../librbd/io/test_mock_ImageRequestWQ.cc | 4 +- .../journal/test_mock_PromoteRequest.cc | 2 +- src/test/librbd/journal/test_mock_Replay.cc | 10 +- .../librbd/journal/test_mock_ResetRequest.cc | 4 +- .../managed_lock/test_mock_AcquireRequest.cc | 4 +- .../managed_lock/test_mock_BreakRequest.cc | 2 +- .../librbd/mirror/test_mock_DisableRequest.cc | 6 +- src/test/librbd/mock/MockImageCtx.h | 2 +- src/test/librbd/mock/MockJournal.h | 2 +- .../object_map/mock/MockInvalidateRequest.h | 2 +- .../object_map/test_mock_RefreshRequest.cc | 4 +- .../test_mock_DisableFeaturesRequest.cc | 8 +- .../test_mock_EnableFeaturesRequest.cc | 8 +- .../operation/test_mock_ResizeRequest.cc | 4 +- .../test_mock_SnapshotRemoveRequest.cc | 2 +- .../test_mock_SnapshotRollbackRequest.cc | 6 +- src/test/librbd/test_fixture.cc | 2 +- src/test/librbd/test_librbd.cc | 6 +- src/test/librbd/test_mock_DeepCopyRequest.cc | 6 +- src/test/librbd/test_mock_ExclusiveLock.cc | 2 +- src/test/librbd/test_mock_Journal.cc | 12 +- src/test/librbd/test_mock_ManagedLock.cc | 10 +- src/test/librbd/test_mock_ObjectMap.cc | 6 +- src/test/librbd/test_mock_ObjectWatcher.cc | 12 +- .../librbd/trash/test_mock_MoveRequest.cc | 2 +- src/test/messenger/message_helper.h | 2 +- src/test/mon/PGMap.cc | 4 +- src/test/mon/test-mon-msg.cc | 4 +- src/test/mon/test_mon_workloadgen.cc | 20 +- src/test/msgr/perf_msgr_server.cc | 2 +- src/test/msgr/test_async_driver.cc | 4 +- src/test/msgr/test_msgr.cc | 12 +- src/test/multi_stress_watch.cc | 4 +- src/test/objectstore/Allocator_bench.cc | 10 +- .../objectstore/DeterministicOpSequence.cc | 2 +- src/test/objectstore/FileStoreTracker.cc | 14 +- src/test/objectstore/TestObjectStoreState.cc | 2 +- src/test/objectstore/chain_xattr.cc | 6 +- src/test/objectstore/store_test.cc | 20 +- src/test/objectstore/store_test_fixture.cc | 4 +- src/test/objectstore/test_bluefs.cc | 4 +- src/test/objectstore/test_idempotent.cc | 8 +- .../objectstore/test_idempotent_sequence.cc | 2 +- src/test/objectstore_bench.cc | 10 +- src/test/omap_bench.cc | 4 +- src/test/on_exit.cc | 26 +-- src/test/os/TestLFNIndex.cc | 4 +- src/test/osd/Object.cc | 12 +- src/test/osd/Object.h | 28 +-- src/test/osd/RadosModel.h | 198 +++++++++--------- src/test/osd/TestOSDMap.cc | 4 +- src/test/osd/TestOpStat.h | 4 +- src/test/osd/TestPGLog.cc | 2 +- src/test/osd/TestRados.cc | 2 +- src/test/osdc/MemWriteback.cc | 6 +- src/test/osdc/object_cacher_stress.cc | 16 +- .../image_deleter/test_mock_RemoveRequest.cc | 4 +- .../test_mock_SnapshotPurgeRequest.cc | 2 +- .../test_mock_TrashMoveRequest.cc | 10 +- .../image_deleter/test_mock_TrashWatcher.cc | 4 +- src/test/rbd_mirror/image_map/test_Policy.cc | 2 +- .../test_mock_BootstrapRequest.cc | 26 +-- .../test_mock_CreateImageRequest.cc | 12 +- .../test_mock_PrepareLocalImageRequest.cc | 2 +- .../test_mock_PrepareRemoteImageRequest.cc | 2 +- src/test/rbd_mirror/random_write.cc | 2 +- src/test/rbd_mirror/test_Instances.cc | 2 +- src/test/rbd_mirror/test_mock_ImageMap.cc | 4 +- .../rbd_mirror/test_mock_ImageReplayer.cc | 30 +-- src/test/rbd_mirror/test_mock_ImageSync.cc | 6 +- .../rbd_mirror/test_mock_InstanceReplayer.cc | 8 +- .../rbd_mirror/test_mock_InstanceWatcher.cc | 12 +- .../rbd_mirror/test_mock_LeaderWatcher.cc | 18 +- src/test/rbd_mirror/test_mock_PoolWatcher.cc | 6 +- src/test/rgw/test_rgw_compression.cc | 2 +- src/test/signals.cc | 2 +- src/test/system/st_rados_create_pool.cc | 8 +- src/test/test_cfuse_cache_invalidate.cc | 9 +- src/test/test_denc.cc | 2 +- src/test/test_rewrite_latency.cc | 2 +- src/test/test_snap_mapper.cc | 24 +-- src/test/testcrypto.cc | 4 +- src/test/testmsgr.cc | 2 +- src/test/xattr_bench.cc | 4 +- 125 files changed, 539 insertions(+), 532 deletions(-) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 018ec4aca26e5..9a1cfe2c0a6a7 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -462,6 +462,9 @@ if(WITH_FUSE) add_executable(ceph_test_cfuse_cache_invalidate test_cfuse_cache_invalidate.cc ) + target_link_libraries(ceph_test_cfuse_cache_invalidate + ceph-common + ) endif(WITH_FUSE) if(${WITH_CEPHFS}) diff --git a/src/test/ObjectMap/KeyValueDBMemory.cc b/src/test/ObjectMap/KeyValueDBMemory.cc index 971a14339451b..a4b2a4e1ca358 100644 --- a/src/test/ObjectMap/KeyValueDBMemory.cc +++ b/src/test/ObjectMap/KeyValueDBMemory.cc @@ -57,7 +57,7 @@ public: return 0; } --it; - assert(it != db->db.end()); + ceph_assert(it != db->db.end()); ready = true; return 0; } @@ -85,7 +85,7 @@ public: return 0; } - assert(it != db->db.end()); + ceph_assert(it != db->db.end()); ready = true; return 0; @@ -98,7 +98,7 @@ public: ready = false; return 0; } - assert(it != db->db.end()); + ceph_assert(it != db->db.end()); ready = true; return 0; } diff --git a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc index a97cb9fb93c80..f93e68c4aafeb 100644 --- a/src/test/ObjectMap/test_keyvaluedb_atomicity.cc +++ b/src/test/ObjectMap/test_keyvaluedb_atomicity.cc @@ -37,8 +37,8 @@ int verify(KeyValueDB *db) { for (map::iterator i = iterators.begin(); i != iterators.end(); ++i) { - assert(i->second->valid()); - assert(i->second->key() == iterators.rbegin()->second->key()); + ceph_assert(i->second->valid()); + ceph_assert(i->second->key() == iterators.rbegin()->second->key()); bufferlist r = i->second->value(); bufferlist l = iterators.rbegin()->second->value(); i->second->next(); @@ -47,7 +47,7 @@ int verify(KeyValueDB *db) { for (map::iterator i = iterators.begin(); i != iterators.end(); ++i) { - assert(!i->second->valid()); + ceph_assert(!i->second->valid()); } } return 0; @@ -73,7 +73,7 @@ void *write(void *_db) { for (int j = 0; j < NUM_COPIES; ++j) { t->set(prefix_gen(j), to_set); } - assert(!db->submit_transaction(t)); + ceph_assert(!db->submit_transaction(t)); } return 0; } @@ -88,7 +88,7 @@ int main() { string strpath(path); std::cerr << "Using path: " << strpath << std::endl; KeyValueDB *store = KeyValueDB::create(g_ceph_context, "leveldb", strpath); - assert(!store->create_and_open(std::cerr)); + ceph_assert(!store->create_and_open(std::cerr)); db.reset(store); verify(db.get()); diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc index 105c6dcb42dda..15ee1f5b36ac2 100644 --- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc +++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc @@ -33,10 +33,10 @@ public: boost::scoped_ptr mock; void SetUp() override { - assert(!store_path.empty()); + ceph_assert(!store_path.empty()); KeyValueDB *db_ptr = KeyValueDB::create(g_ceph_context, "leveldb", store_path); - assert(!db_ptr->create_and_open(std::cerr)); + ceph_assert(!db_ptr->create_and_open(std::cerr)); db.reset(db_ptr); mock.reset(new KeyValueDBMemory()); } diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc index ddf23cffc7f5d..ad2c56e5a03c4 100644 --- a/src/test/ObjectMap/test_object_map.cc +++ b/src/test/ObjectMap/test_object_map.cc @@ -646,7 +646,7 @@ public: cerr << "using path " << strpath << std::endl; KeyValueDB *store = KeyValueDB::create(g_ceph_context, "leveldb", strpath); - assert(!store->create_and_open(cerr)); + ceph_assert(!store->create_and_open(cerr)); db.reset(new DBObjectMap(g_ceph_context, store)); tester.db = db.get(); @@ -1051,7 +1051,7 @@ TEST_F(ObjectMapTest, RandomTestNoDeletesXattrs) { string num_to_key(unsigned i) { char buf[100]; int ret = snprintf(buf, sizeof(buf), "%010u", i); - assert(ret > 0); + ceph_assert(ret > 0); return string(buf, ret); } diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc index fdcbdd3c245b3..baab56373d2ae 100644 --- a/src/test/bufferlist.cc +++ b/src/test/bufferlist.cc @@ -276,7 +276,7 @@ protected: snprintf(cmd, sizeof(cmd), "echo ABC > %s", FILENAME); EXPECT_EQ(0, ::system(cmd)); fd = ::open(FILENAME, O_RDONLY); - assert(fd >= 0); + ceph_assert(fd >= 0); } void TearDown() override { ::close(fd); @@ -2592,7 +2592,7 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "a.crc32c(0) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 1138817026u); } - assert(buffer::get_cached_crc() == 0 + base_cached); + ceph_assert(buffer::get_cached_crc() == 0 + base_cached); { utime_t start = ceph_clock_now(); uint32_t r = bla.crc32c(0); @@ -2601,7 +2601,7 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "a.crc32c(0) (again) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 1138817026u); } - assert(buffer::get_cached_crc() == 1 + base_cached); + ceph_assert(buffer::get_cached_crc() == 1 + base_cached); { utime_t start = ceph_clock_now(); @@ -2611,8 +2611,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "a.crc32c(5) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 3239494520u); } - assert(buffer::get_cached_crc() == 1 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 1 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 1 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 1 + base_cached_adjusted); { utime_t start = ceph_clock_now(); uint32_t r = bla.crc32c(5); @@ -2621,8 +2621,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "a.crc32c(5) (again) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 3239494520u); } - assert(buffer::get_cached_crc() == 1 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 2 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 1 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 2 + base_cached_adjusted); { utime_t start = ceph_clock_now(); uint32_t r = blb.crc32c(0); @@ -2631,7 +2631,7 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "b.crc32c(0) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 2481791210u); } - assert(buffer::get_cached_crc() == 1 + base_cached); + ceph_assert(buffer::get_cached_crc() == 1 + base_cached); { utime_t start = ceph_clock_now(); uint32_t r = blb.crc32c(0); @@ -2640,7 +2640,7 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "b.crc32c(0) (again)= " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 2481791210u); } - assert(buffer::get_cached_crc() == 2 + base_cached); + ceph_assert(buffer::get_cached_crc() == 2 + base_cached); bufferlist ab; ab.push_back(a); @@ -2653,8 +2653,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "ab.crc32c(0) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 2988268779u); } - assert(buffer::get_cached_crc() == 3 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 3 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 3 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 3 + base_cached_adjusted); bufferlist ac; ac.push_back(a); ac.push_back(c); @@ -2666,8 +2666,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "ac.crc32c(0) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 2988268779u); } - assert(buffer::get_cached_crc() == 4 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 3 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 4 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 3 + base_cached_adjusted); bufferlist ba; ba.push_back(b); @@ -2680,8 +2680,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "ba.crc32c(0) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 169240695u); } - assert(buffer::get_cached_crc() == 5 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 4 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 5 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 4 + base_cached_adjusted); { utime_t start = ceph_clock_now(); uint32_t r = ba.crc32c(5); @@ -2690,8 +2690,8 @@ TEST(BufferList, crc32c_append_perf) { std::cout << "ba.crc32c(5) = " << r << " at " << rate << " MB/sec" << std::endl; ASSERT_EQ(r, 1265464778u); } - assert(buffer::get_cached_crc() == 5 + base_cached); - assert(buffer::get_cached_crc_adjusted() == 6 + base_cached_adjusted); + ceph_assert(buffer::get_cached_crc() == 5 + base_cached); + ceph_assert(buffer::get_cached_crc_adjusted() == 6 + base_cached_adjusted); cout << "crc cache hits (same start) = " << buffer::get_cached_crc() << std::endl; cout << "crc cache hits (adjusted) = " << buffer::get_cached_crc_adjusted() << std::endl; diff --git a/src/test/ceph_compatset.cc b/src/test/ceph_compatset.cc index 3010b55998865..7b274e2a56253 100644 --- a/src/test/ceph_compatset.cc +++ b/src/test/ceph_compatset.cc @@ -25,9 +25,6 @@ #include "include/compat.h" #include "include/coredumpctl.h" -//#undef assert -//#define assert(foo) if (!(foo)) abort(); - #include "include/CompatSet.h" #include "gtest/gtest.h" diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt index 9b6667b9bc2c2..c793d1a6bb8ab 100644 --- a/src/test/common/CMakeLists.txt +++ b/src/test/common/CMakeLists.txt @@ -39,6 +39,7 @@ target_link_libraries(unittest_histogram ceph-common) add_executable(unittest_prioritized_queue test_prioritized_queue.cc ) +target_link_libraries(unittest_prioritized_queue ceph-common) add_ceph_unittest(unittest_prioritized_queue) # unittest_mclock_priority_queue @@ -213,6 +214,7 @@ target_link_libraries(unittest_interval_set ceph-common) add_executable(unittest_weighted_priority_queue test_weighted_priority_queue.cc ) +target_link_libraries(unittest_weighted_priority_queue ceph-common) add_ceph_unittest(unittest_weighted_priority_queue) # unittest_mutex_debug @@ -299,4 +301,4 @@ target_link_libraries(unittest_async_completion Boost::system) add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) add_ceph_unittest(unittest_async_shared_mutex) -target_link_libraries(unittest_async_shared_mutex Boost::system) +target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) diff --git a/src/test/common/ObjectContents.cc b/src/test/common/ObjectContents.cc index 3b7e1f3e7a6be..381c59c7c859d 100644 --- a/src/test/common/ObjectContents.cc +++ b/src/test/common/ObjectContents.cc @@ -7,11 +7,11 @@ bool test_object_contents() { ObjectContents c, d; - assert(!c.exists()); + ceph_assert(!c.exists()); c.debug(std::cerr); c.write(10, 10, 10); - assert(c.exists()); - assert(c.size() == 20); + ceph_assert(c.exists()); + ceph_assert(c.size() == 20); c.debug(std::cerr); bufferlist bl; @@ -20,7 +20,7 @@ bool test_object_contents() ++iter) { bl.append(*iter); } - assert(bl.length() == 20); + ceph_assert(bl.length() == 20); bufferlist bl2; for (unsigned i = 0; i < 8; ++i) bl2.append(bl[i]); @@ -34,21 +34,21 @@ bool test_object_contents() bl2.append(*iter); } for (unsigned i = 12; i < 20; ++i) bl2.append(bl[i]); - assert(bl2.length() == 20); + ceph_assert(bl2.length() == 20); for (ObjectContents::Iterator iter3 = c.get_iterator(); iter.valid(); ++iter) { - assert(bl2[iter3.get_pos()] == *iter3); + ceph_assert(bl2[iter3.get_pos()] == *iter3); } - assert(bl2[0] == '\0'); - assert(bl2[7] == '\0'); + ceph_assert(bl2[0] == '\0'); + ceph_assert(bl2[7] == '\0'); interval_set to_clone; to_clone.insert(5, 10); d.clone_range(c, to_clone); - assert(d.size() == 15); + ceph_assert(d.size() == 15); c.debug(std::cerr); d.debug(std::cerr); @@ -57,8 +57,8 @@ bool test_object_contents() iter2.seek_to(5); for (uint64_t i = 5; i < 15; ++i, ++iter2) { std::cerr << "i is " << i << std::endl; - assert(iter2.get_pos() == i); - assert(*iter2 == bl2[i]); + ceph_assert(iter2.get_pos() == i); + ceph_assert(*iter2 == bl2[i]); } return true; } diff --git a/src/test/common/ObjectContents.h b/src/test/common/ObjectContents.h index dac8f5a4c7359..7834bfedf0a21 100644 --- a/src/test/common/ObjectContents.h +++ b/src/test/common/ObjectContents.h @@ -60,7 +60,7 @@ public: Iterator &operator++() { ++pos; if (iter != parent->seeds.end() && pos >= iter->first) { - assert(pos == iter->first); + ceph_assert(pos == iter->first); current_state = iter->second; ++iter; } diff --git a/src/test/common/Throttle.cc b/src/test/common/Throttle.cc index 61f77aacf6a71..0737f12887650 100644 --- a/src/test/common/Throttle.cc +++ b/src/test/common/Throttle.cc @@ -244,7 +244,7 @@ std::pair > test_backoff( max_multiple, max, 0); - assert(valid); + ceph_assert(valid); auto getter = [&]() { std::random_device rd; @@ -280,7 +280,7 @@ std::pair > test_backoff( total_observed_total += total; total_observations++; in_queue.pop_front(); - assert(total <= max); + ceph_assert(total <= max); g.unlock(); std::this_thread::sleep_for( diff --git a/src/test/common/test_sharedptr_registry.cc b/src/test/common/test_sharedptr_registry.cc index 765cc814d8722..67039ba9f142b 100644 --- a/src/test/common/test_sharedptr_registry.cc +++ b/src/test/common/test_sharedptr_registry.cc @@ -270,9 +270,9 @@ TEST_F(SharedPtrRegistry_all, remove) { ptr1 = std::shared_ptr(); std::shared_ptr res = registry.lookup(key1); - assert(res); - assert(res == ptr2); - assert(*res == 500); + ceph_assert(res); + ceph_assert(res == ptr2); + ceph_assert(*res == 500); } { SharedPtrRegistryTest registry; @@ -284,9 +284,9 @@ TEST_F(SharedPtrRegistry_all, remove) { ptr1 = std::shared_ptr(); std::shared_ptr res = registry.lookup(key1); - assert(res); - assert(res == ptr2); - assert(*res == 500); + ceph_assert(res); + ceph_assert(res == ptr2); + ceph_assert(*res == 500); } } diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc index 0bdc2f2601e11..21eb62550aabf 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 { - assert(0 == "bad option"); + ceph_assert(0 == "bad option"); } } cout << "[plugin " << plugin << " (" << GetParam() << ")]" << std::endl; diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc index bd93543b65837..cffd20702990e 100644 --- a/src/test/crush/CrushWrapper.cc +++ b/src/test/crush/CrushWrapper.cc @@ -1013,7 +1013,7 @@ TEST(CrushWrapper, choose_args_compat) { item = 2; c.insert_item(g_ceph_context, item, weight, "osd.2", loc); - assert(c.add_simple_rule("rule1", "r11", "host", "", + ceph_assert(c.add_simple_rule("rule1", "r11", "host", "", "firstn", pg_pool_t::TYPE_ERASURE) >= 0); int id = c.get_item_id("b1"); @@ -1023,7 +1023,7 @@ TEST(CrushWrapper, choose_args_compat) { weight_set.size = 1; weight_set.weights = &weights; int maxbuckets = c.get_max_buckets(); - assert(maxbuckets > 0); + ceph_assert(maxbuckets > 0); crush_choose_arg choose_args[maxbuckets]; memset(choose_args, '\0', sizeof(crush_choose_arg) * maxbuckets); choose_args[-1-id].ids_size = 0; @@ -1085,7 +1085,7 @@ TEST(CrushWrapper, remove_root) { loc["root"] = "default"; c.insert_item(g_ceph_context, item, weight, "osd.2", loc); - assert(c.add_simple_rule("rule1", "r11", "host", "", + ceph_assert(c.add_simple_rule("rule1", "r11", "host", "", "firstn", pg_pool_t::TYPE_ERASURE) >= 0); ASSERT_TRUE(c.name_exists("default")); ASSERT_TRUE(c.name_exists("r11")); diff --git a/src/test/crush/crush.cc b/src/test/crush/crush.cc index dba3bb584dc01..42a389e5e8ade 100644 --- a/src/test/crush/crush.cc +++ b/src/test/crush/crush.cc @@ -53,15 +53,15 @@ std::unique_ptr build_indep_map(CephContext *cct, int num_rack, int ret; int ruleno = 0; ret = c->add_rule(ruleno, 4, 123, 1, 20); - assert(ret == ruleno); + ceph_assert(ret == ruleno); ret = c->set_rule_step(ruleno, 0, CRUSH_RULE_SET_CHOOSELEAF_TRIES, 10, 0); - assert(ret == 0); + ceph_assert(ret == 0); ret = c->set_rule_step(ruleno, 1, CRUSH_RULE_TAKE, rootno, 0); - assert(ret == 0); + ceph_assert(ret == 0); ret = c->set_rule_step(ruleno, 2, CRUSH_RULE_CHOOSELEAF_INDEP, CRUSH_CHOOSE_N, 1); - assert(ret == 0); + ceph_assert(ret == 0); ret = c->set_rule_step(ruleno, 3, CRUSH_RULE_EMIT, 0, 0); - assert(ret == 0); + ceph_assert(ret == 0); c->set_rule_name(ruleno, "data"); c->finalize(); diff --git a/src/test/crypto.cc b/src/test/crypto.cc index ac770ea5fcf46..eb45600f84807 100644 --- a/src/test/crypto.cc +++ b/src/test/crypto.cc @@ -47,7 +47,7 @@ static int nss_aes_operation(CK_ATTRIBUTE_TYPE op, PK11Context *ectx; ectx = PK11_CreateContextBySymKey(mechanism, op, key, param); - assert(ectx); + ceph_assert(ectx); incopy = in; // it's a shallow copy! in_buf = (unsigned char*)incopy.c_str(); diff --git a/src/test/fio/fio_ceph_objectstore.cc b/src/test/fio/fio_ceph_objectstore.cc index d65dc28bee7c5..4a34ca1083455 100644 --- a/src/test/fio/fio_ceph_objectstore.cc +++ b/src/test/fio/fio_ceph_objectstore.cc @@ -193,7 +193,7 @@ int init_collections(std::unique_ptr& os, std::vector& collections, uint64_t count) { - assert(count > 0); + ceph_assert(count > 0); collections.reserve(count); const int split_bits = cbits(count - 1); @@ -381,7 +381,7 @@ Engine::Engine(thread_data* td) Engine::~Engine() { - assert(!ref_count); + ceph_assert(!ref_count); } struct Object { @@ -583,7 +583,7 @@ enum fio_q_status fio_ceph_os_queue(thread_data* td, io_u* u) // fill attrs if any if (o->oi_attr_len_high) { - assert(o->oi_attr_len_high >= o->oi_attr_len_low); + ceph_assert(o->oi_attr_len_high >= o->oi_attr_len_low); // fill with the garbage as we do not care of the actual content... job->one_for_all_data.set_length( ceph::util::generate_random_number( @@ -591,7 +591,7 @@ enum fio_q_status fio_ceph_os_queue(thread_data* td, io_u* u) attrset["_"] = job->one_for_all_data; } if (o->snapset_attr_len_high) { - assert(o->snapset_attr_len_high >= o->snapset_attr_len_low); + ceph_assert(o->snapset_attr_len_high >= o->snapset_attr_len_low); job->one_for_all_data.set_length( ceph::util::generate_random_number (o->snapset_attr_len_low, o->snapset_attr_len_high)); @@ -599,7 +599,7 @@ enum fio_q_status fio_ceph_os_queue(thread_data* td, io_u* u) } if (o->_fastinfo_omap_len_high) { - assert(o->_fastinfo_omap_len_high >= o->_fastinfo_omap_len_low); + ceph_assert(o->_fastinfo_omap_len_high >= o->_fastinfo_omap_len_low); // fill with the garbage as we do not care of the actual content... job->one_for_all_data.set_length( ceph::util::generate_random_number( @@ -635,7 +635,7 @@ enum fio_q_status fio_ceph_os_queue(thread_data* td, io_u* u) } if (o->pglog_omap_len_high) { - assert(o->pglog_omap_len_high >= o->pglog_omap_len_low); + ceph_assert(o->pglog_omap_len_high >= o->pglog_omap_len_low); snprintf(ver_key, sizeof(ver_key), "0000000011.%020llu", (unsigned long long)pglog_ver_cnt); // fill with the garbage as we do not care of the actual content... @@ -646,7 +646,7 @@ enum fio_q_status fio_ceph_os_queue(thread_data* td, io_u* u) } if (o->pglog_dup_omap_len_high) { //insert dup - assert(o->pglog_dup_omap_len_high >= o->pglog_dup_omap_len_low); + ceph_assert(o->pglog_dup_omap_len_high >= o->pglog_dup_omap_len_low); for( auto i = pglog_trim_tail; i < pglog_trim_head; ++i) { snprintf(ver_key, sizeof(ver_key), "dup_0000000011.%020llu", (unsigned long long)i); diff --git a/src/test/journal/mock/MockJournaler.h b/src/test/journal/mock/MockJournaler.h index 6af3087561fba..8a72537fcc64c 100644 --- a/src/test/journal/mock/MockJournaler.h +++ b/src/test/journal/mock/MockJournaler.h @@ -23,7 +23,7 @@ struct Settings; struct MockFuture { static MockFuture *s_instance; static MockFuture &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -53,7 +53,7 @@ struct MockFutureProxy { struct MockReplayEntry { static MockReplayEntry *s_instance; static MockReplayEntry &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -78,7 +78,7 @@ struct MockReplayEntryProxy { struct MockJournaler { static MockJournaler *s_instance; static MockJournaler &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } diff --git a/src/test/journal/test_FutureImpl.cc b/src/test/journal/test_FutureImpl.cc index f904c6eefbb9f..14e9d530ded97 100644 --- a/src/test/journal/test_FutureImpl.cc +++ b/src/test/journal/test_FutureImpl.cc @@ -17,7 +17,7 @@ public: ++refs; } void put() override { - assert(refs > 0); + ceph_assert(refs > 0); --refs; } void flush(const journal::FutureImplPtr &future) override { diff --git a/src/test/kv_store_bench.cc b/src/test/kv_store_bench.cc index 943be685032bf..76cc375ea8bae 100644 --- a/src/test/kv_store_bench.cc +++ b/src/test/kv_store_bench.cc @@ -359,14 +359,14 @@ int KvStoreBench::test_teuthology_aio(next_gen_t distr, Mutex::Locker l(ops_in_flight_lock); for (int i = 0; i < ops; i++) { - assert(ops_in_flight <= max_ops_in_flight); + ceph_assert(ops_in_flight <= max_ops_in_flight); if (ops_in_flight == max_ops_in_flight) { int err = op_avail.Wait(ops_in_flight_lock); if (err < 0) { ceph_abort(); return err; } - assert(ops_in_flight < max_ops_in_flight); + ceph_assert(ops_in_flight < max_ops_in_flight); } cout << "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t" << i + 1 << " / " << ops << std::endl; diff --git a/src/test/libcephfs/deleg.cc b/src/test/libcephfs/deleg.cc index 7ffae2c924f64..4c0d1c4922a64 100644 --- a/src/test/libcephfs/deleg.cc +++ b/src/test/libcephfs/deleg.cc @@ -27,6 +27,8 @@ #include #include +#include "include/assert.h" + /* in ms -- 1 minute */ #define MAX_WAIT (60 * 1000) @@ -132,7 +134,7 @@ static void namespace_breaker_func(struct ceph_mount_info *cmount, int cmd, cons break; default: // Bad command - assert(false); + ceph_assert(false); } if (ret != -EAGAIN) break; diff --git a/src/test/librados/test_common.cc b/src/test/librados/test_common.cc index f8f7de7906af8..013f5c3b792bc 100644 --- a/src/test/librados/test_common.cc +++ b/src/test/librados/test_common.cc @@ -45,7 +45,7 @@ int wait_for_healthy(rados_t *cluster) json_spirit::mValue root; [[maybe_unused]] bool json_parse_success = json_spirit::read(out, root); - assert(json_parse_success); + ceph_assert(json_parse_success); json_spirit::mObject root_obj = root.get_obj(); json_spirit::mObject pgmap = root_obj["pgmap"].get_obj(); json_spirit::mArray pgs_by_state = pgmap["pgs_by_state"].get_array(); diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc index 9ccbe01ea029d..26d2c0e69eab7 100644 --- a/src/test/librados/tier.cc +++ b/src/test/librados/tier.cc @@ -2391,7 +2391,7 @@ static int _get_pg_num(Rados& cluster, string pool_name) + string("\",\"var\": \"pg_num\",\"format\": \"json\"}"); bufferlist outbl; int r = cluster.mon_command(cmd, inbl, &outbl, NULL); - assert(r >= 0); + ceph_assert(r >= 0); string outstr(outbl.c_str(), outbl.length()); json_spirit::Value v; if (!json_spirit::read(outstr, v)) { @@ -2414,7 +2414,7 @@ static int _get_pg_num(Rados& cluster, string pool_name) TEST_F(LibRadosTwoPoolsPP, HitSetWrite) { int num_pg = _get_pg_num(cluster, pool_name); - assert(num_pg > 0); + ceph_assert(num_pg > 0); // make it a tier bufferlist inbl; @@ -5551,7 +5551,7 @@ TEST_F(LibRadosTwoPoolsECPP, HitSetRead) { #if 0 TEST_F(LibRadosTierECPP, HitSetWrite) { int num_pg = _get_pg_num(cluster, pool_name); - assert(num_pg > 0); + ceph_assert(num_pg > 0); // enable hitset tracking for this pool bufferlist inbl; diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc index 5e65add855e2b..bae3c0852fef5 100644 --- a/src/test/librados/watch_notify.cc +++ b/src/test/librados/watch_notify.cc @@ -67,9 +67,9 @@ void LibRadosWatchNotify::watch_notify2_test_cb(void *arg, { std::cout << __func__ << " from " << notifier_gid << " notify_id " << notify_id << " cookie " << cookie << std::endl; - assert(notifier_gid > 0); + ceph_assert(notifier_gid > 0); auto thiz = reinterpret_cast(arg); - assert(thiz); + ceph_assert(thiz); thiz->notify_cookies.insert(cookie); thiz->notify_bl.clear(); thiz->notify_bl.append((char*)data, data_len); @@ -84,9 +84,9 @@ void LibRadosWatchNotify::watch_notify2_test_errcb(void *arg, int err) { std::cout << __func__ << " cookie " << cookie << " err " << err << std::endl; - assert(cookie > 1000); + ceph_assert(cookie > 1000); auto thiz = reinterpret_cast(arg); - assert(thiz); + ceph_assert(thiz); thiz->notify_err = err; } @@ -130,7 +130,7 @@ public: void handle_error(uint64_t cookie, int err) override { std::cout << __func__ << " cookie " << cookie << " err " << err << std::endl; - assert(cookie > 1000); + ceph_assert(cookie > 1000); notify->notify_err = err; } }; diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc index 87b17fda82ff5..38a948a857120 100644 --- a/src/test/librados_test_stub/LibradosTestStub.cc +++ b/src/test/librados_test_stub/LibradosTestStub.cc @@ -945,7 +945,7 @@ Rados::Rados(IoCtx& ioctx) { impl->get(); client = reinterpret_cast(impl); - assert(client != NULL); + ceph_assert(client != NULL); } Rados::~Rados() { @@ -958,7 +958,7 @@ AioCompletion *Rados::aio_create_completion(void *cb_arg, AioCompletionImpl *c; int r = rados_aio_create_completion(cb_arg, cb_complete, cb_safe, reinterpret_cast(&c)); - assert(r == 0); + ceph_assert(r == 0); return new AioCompletion(c); } diff --git a/src/test/librados_test_stub/TestClassHandler.cc b/src/test/librados_test_stub/TestClassHandler.cc index b61abfe76a839..8994deb003aa7 100644 --- a/src/test/librados_test_stub/TestClassHandler.cc +++ b/src/test/librados_test_stub/TestClassHandler.cc @@ -57,7 +57,7 @@ void TestClassHandler::open_class(const std::string& name, } void TestClassHandler::open_all_classes() { - assert(m_class_handles.empty()); + ceph_assert(m_class_handles.empty()); const char* env = getenv("CEPH_LIB"); std::string CEPH_LIB(env ? env : "lib"); diff --git a/src/test/librados_test_stub/TestIoCtxImpl.cc b/src/test/librados_test_stub/TestIoCtxImpl.cc index 0c5ce25a926aa..5ddfc75b235fc 100644 --- a/src/test/librados_test_stub/TestIoCtxImpl.cc +++ b/src/test/librados_test_stub/TestIoCtxImpl.cc @@ -40,7 +40,7 @@ TestIoCtxImpl::TestIoCtxImpl(const TestIoCtxImpl& rhs) } TestIoCtxImpl::~TestIoCtxImpl() { - assert(m_pending_ops == 0); + ceph_assert(m_pending_ops == 0); } void TestObjectOperationImpl::get() { diff --git a/src/test/librados_test_stub/TestMemCluster.cc b/src/test/librados_test_stub/TestMemCluster.cc index e8e2c60ca1032..3779be75c9c2e 100644 --- a/src/test/librados_test_stub/TestMemCluster.cc +++ b/src/test/librados_test_stub/TestMemCluster.cc @@ -54,7 +54,7 @@ int TestMemCluster::register_object_handler(int64_t pool_id, auto& object_handlers = pool->file_handlers[locator]; auto it = object_handlers.find(object_handler); - assert(it == object_handlers.end()); + ceph_assert(it == object_handlers.end()); object_handlers.insert(object_handler); return 0; @@ -189,13 +189,13 @@ void TestMemCluster::transaction_start(const ObjectLocator& locator) { m_transaction_cond.Wait(m_lock); } auto result = m_transactions.insert(locator); - assert(result.second); + ceph_assert(result.second); } void TestMemCluster::transaction_finish(const ObjectLocator& locator) { Mutex::Locker locker(m_lock); size_t count = m_transactions.erase(locator); - assert(count == 1); + ceph_assert(count == 1); m_transaction_cond.Signal(); } diff --git a/src/test/librados_test_stub/TestMemIoCtxImpl.cc b/src/test/librados_test_stub/TestMemIoCtxImpl.cc index 013b47992964c..8b64786add725 100644 --- a/src/test/librados_test_stub/TestMemIoCtxImpl.cc +++ b/src/test/librados_test_stub/TestMemIoCtxImpl.cc @@ -334,7 +334,7 @@ int TestMemIoCtxImpl::remove(const std::string& oid, const SnapContext &snapc) { TestCluster::ObjectLocator locator(get_namespace(), oid); TestMemCluster::Files::iterator it = m_pool->files.find(locator); - assert(it != m_pool->files.end()); + ceph_assert(it != m_pool->files.end()); if (*it->second.rbegin() == file) { TestMemCluster::ObjectHandlers object_handlers; @@ -757,8 +757,8 @@ void TestMemIoCtxImpl::ensure_minimum_length(size_t len, bufferlist *bl) { TestMemCluster::SharedFile TestMemIoCtxImpl::get_file( const std::string &oid, bool write, const SnapContext &snapc) { - assert(m_pool->file_lock.is_locked() || m_pool->file_lock.is_wlocked()); - assert(!write || m_pool->file_lock.is_wlocked()); + ceph_assert(m_pool->file_lock.is_locked() || m_pool->file_lock.is_wlocked()); + ceph_assert(!write || m_pool->file_lock.is_wlocked()); TestMemCluster::SharedFile file; TestMemCluster::Files::iterator it = m_pool->files.find( @@ -806,7 +806,7 @@ TestMemCluster::SharedFile TestMemIoCtxImpl::get_file( if (get_snap_read() == CEPH_NOSNAP) { if (!file->exists) { - assert(it->second.size() > 1); + ceph_assert(it->second.size() > 1); return TestMemCluster::SharedFile(); } return file; diff --git a/src/test/librados_test_stub/TestWatchNotify.cc b/src/test/librados_test_stub/TestWatchNotify.cc index 7defa99d9d26a..c98bcecb731a0 100644 --- a/src/test/librados_test_stub/TestWatchNotify.cc +++ b/src/test/librados_test_stub/TestWatchNotify.cc @@ -220,7 +220,7 @@ void TestWatchNotify::execute_unwatch(TestRadosClient *rados_client, TestWatchNotify::SharedWatcher TestWatchNotify::get_watcher( int64_t pool_id, const std::string& nspace, const std::string& oid) { - assert(m_lock.is_locked()); + ceph_assert(m_lock.is_locked()); auto it = m_file_watchers.find({pool_id, nspace, oid}); if (it == m_file_watchers.end()) { @@ -241,7 +241,7 @@ TestWatchNotify::SharedWatcher TestWatchNotify::get_watcher( } void TestWatchNotify::maybe_remove_watcher(SharedWatcher watcher) { - assert(m_lock.is_locked()); + ceph_assert(m_lock.is_locked()); // TODO if (watcher->watch_handles.empty() && watcher->notify_handles.empty()) { @@ -324,7 +324,7 @@ void TestWatchNotify::ack_notify(TestRadosClient *rados_client, int64_t pool_id, const bufferlist &bl) { CephContext *cct = rados_client->cct(); - assert(m_lock.is_locked()); + ceph_assert(m_lock.is_locked()); SharedWatcher watcher = get_watcher(pool_id, nspace, oid); if (!watcher) { ldout(cct, 1) << "oid=" << oid << ": not found" << dendl; @@ -357,9 +357,9 @@ void TestWatchNotify::finish_notify(TestRadosClient *rados_client, ldout(cct, 20) << "oid=" << oid << ", notify_id=" << notify_id << dendl; - assert(m_lock.is_locked()); + ceph_assert(m_lock.is_locked()); SharedWatcher watcher = get_watcher(pool_id, nspace, oid); - assert(watcher); + ceph_assert(watcher); NotifyHandles::iterator it = watcher->notify_handles.find(notify_id); if (it == watcher->notify_handles.end()) { diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index 4c58e997458b6..bd54cef1cda4e 100644 --- a/src/test/librbd/CMakeLists.txt +++ b/src/test/librbd/CMakeLists.txt @@ -108,6 +108,7 @@ target_link_libraries(unittest_librbd rbd_internal rbd_types osdc + ceph-common global ${UNITTEST_LIBS} radostest) @@ -135,6 +136,7 @@ add_executable(ceph_test_librbd_api $ $) target_link_libraries(ceph_test_librbd_api + ceph-common librbd librados ${UNITTEST_LIBS}) diff --git a/src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc index 04d93f4e025b0..06750906bbbb5 100644 --- a/src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc @@ -26,7 +26,7 @@ struct MockTestImageCtx : public librbd::MockImageCtx { const std::string &image_id, librados::snap_t snap_id, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -52,7 +52,7 @@ struct ObjectCopyRequest { librbd::MockTestImageCtx *src_parent_image_ctx, librbd::MockTestImageCtx *dst_image_ctx, const SnapMap &snap_map, uint64_t object_number, bool flatten, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); Mutex::Locker locker(s_instance->lock); s_instance->snap_map = &snap_map; s_instance->object_contexts[object_number] = on_finish; @@ -84,7 +84,7 @@ struct CloseRequest { Context* on_finish = nullptr; static CloseRequest* s_instance; static CloseRequest* create(MockTestImageCtx *image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -104,7 +104,7 @@ struct OpenRequest { static OpenRequest* s_instance; static OpenRequest* create(MockTestImageCtx *image_ctx, bool skip_open_parent, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc index a52c62fbb060e..20a8b9c6c72f7 100644 --- a/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc @@ -46,7 +46,7 @@ struct ImageRequest { static void aio_read(MockTestImageCtx *ictx, AioCompletion *c, Extents &&image_extents, ReadResult &&read_result, int op_flags, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_read(c, image_extents); } MOCK_METHOD2(aio_read, void(AioCompletion *, const Extents&)); @@ -291,8 +291,8 @@ public: Return(true))); } else { expect.WillOnce(DoAll(WithArg<6>(Invoke([&mock_image_ctx, snap_id, state](Context *ctx) { - assert(mock_image_ctx.image_ctx->snap_lock.is_locked()); - assert(mock_image_ctx.image_ctx->object_map_lock.is_wlocked()); + ceph_assert(mock_image_ctx.image_ctx->snap_lock.is_locked()); + ceph_assert(mock_image_ctx.image_ctx->object_map_lock.is_wlocked()); mock_image_ctx.image_ctx->object_map->aio_update( snap_id, 0, 1, state, boost::none, {}, ctx); })), diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc index 07a3327f4f07a..18e0614ccdd20 100644 --- a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc @@ -37,7 +37,7 @@ public: uint64_t size, const librbd::ParentSpec &parent_spec, uint64_t parent_overlap, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -59,7 +59,7 @@ struct SnapshotCreateRequest { const librbd::ParentSpec &parent_spec, uint64_t parent_overlap, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc index e60a4a3be48e9..88e9359e1c753 100644 --- a/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc +++ b/src/test/librbd/deep_copy/test_mock_SnapshotCreateRequest.cc @@ -36,7 +36,7 @@ public: uint64_t size, const librbd::ParentSpec &parent_spec, uint64_t parent_overlap, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/exclusive_lock/test_mock_PostAcquireRequest.cc b/src/test/librbd/exclusive_lock/test_mock_PostAcquireRequest.cc index dd2e2c6690665..b9f43a0c9b352 100644 --- a/src/test/librbd/exclusive_lock/test_mock_PostAcquireRequest.cc +++ b/src/test/librbd/exclusive_lock/test_mock_PostAcquireRequest.cc @@ -43,7 +43,7 @@ struct RefreshRequest { bool acquire_lock_refresh, bool skip_open_parent, Context *on_finish) { EXPECT_TRUE(acquire_lock_refresh); - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc index 6dec892667109..b0863e42aca21 100644 --- a/src/test/librbd/fsx.cc +++ b/src/test/librbd/fsx.cc @@ -575,7 +575,7 @@ __librbd_open(const char *name, struct rbd_ctx *ctx) rbd_image_t image; int ret; - assert(!ctx->name && !ctx->image && + ceph_assert(!ctx->name && !ctx->image && !ctx->krbd_name && ctx->krbd_fd < 0); ret = rbd_open(ioctx, name, &image, NULL); @@ -603,7 +603,7 @@ __librbd_close(struct rbd_ctx *ctx) { int ret; - assert(ctx->name && ctx->image); + ceph_assert(ctx->name && ctx->image); ret = rbd_close(ctx->image); if (ret < 0) { @@ -797,16 +797,16 @@ __librbd_deep_copy(struct rbd_ctx *ctx, const char *src_snapname, }; ret = rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_FEATURES, features); - assert(ret == 0); + ceph_assert(ret == 0); ret = rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_ORDER, *order); - assert(ret == 0); + ceph_assert(ret == 0); ret = rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_STRIPE_UNIT, stripe_unit); - assert(ret == 0); + ceph_assert(ret == 0); ret = rbd_image_options_set_uint64(opts, RBD_IMAGE_OPTION_STRIPE_COUNT, stripe_count); - assert(ret == 0); + ceph_assert(ret == 0); ret = rbd_snap_set(ctx->image, src_snapname); if (ret < 0) { @@ -992,7 +992,7 @@ krbd_close(struct rbd_ctx *ctx) { int ret; - assert(ctx->krbd_name && ctx->krbd_fd >= 0); + ceph_assert(ctx->krbd_name && ctx->krbd_fd >= 0); if (close(ctx->krbd_fd) < 0) { ret = -errno; @@ -1148,7 +1148,7 @@ krbd_resize(struct rbd_ctx *ctx, uint64_t size) { int ret; - assert(size % truncbdy == 0); + ceph_assert(size % truncbdy == 0); /* * When krbd detects a size change, it calls revalidate_disk(), @@ -1279,7 +1279,7 @@ nbd_close(struct rbd_ctx *ctx) { int r; - assert(ctx->krbd_name && ctx->krbd_fd >= 0); + ceph_assert(ctx->krbd_name && ctx->krbd_fd >= 0); if (close(ctx->krbd_fd) < 0) { r = -errno; @@ -1415,7 +1415,7 @@ ggate_close(struct rbd_ctx *ctx) { int r; - assert(ctx->krbd_name && ctx->krbd_fd >= 0); + ceph_assert(ctx->krbd_name && ctx->krbd_fd >= 0); if (close(ctx->krbd_fd) < 0) { r = -errno; @@ -1547,7 +1547,7 @@ ggate_resize(struct rbd_ctx *ctx, uint64_t size) { int ret; - assert(size % truncbdy == 0); + ceph_assert(size % truncbdy == 0); ret = __ggate_flush(ctx, false); if (ret < 0) { @@ -2481,7 +2481,7 @@ do_clone() clone_imagename(imagename, sizeof(imagename), num_clones); clone_imagename(lastimagename, sizeof(lastimagename), num_clones - 1); - assert(strcmp(lastimagename, ctx.name) == 0); + ceph_assert(strcmp(lastimagename, ctx.name) == 0); ret = ops->clone(&ctx, "snap", imagename, &order, stripe_unit, stripe_count); @@ -2509,7 +2509,7 @@ do_clone() newsize = 0; } - assert(newsize != (uint64_t)file_size); + ceph_assert(newsize != (uint64_t)file_size); prt("truncating image %s from 0x%llx (overlap 0x%llx) to 0x%llx\n", ctx.name, file_size, overlap, newsize); diff --git a/src/test/librbd/image/test_mock_CloneRequest.cc b/src/test/librbd/image/test_mock_CloneRequest.cc index 8c4d270701316..d892b70dad9bb 100644 --- a/src/test/librbd/image/test_mock_CloneRequest.cc +++ b/src/test/librbd/image/test_mock_CloneRequest.cc @@ -26,14 +26,14 @@ struct MockTestImageCtx : public MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } static MockTestImageCtx* create(const std::string &image_name, const std::string &image_id, librados::snap_t snap_id, IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -60,7 +60,7 @@ struct CreateRequest { bool skip_mirror_enable, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -81,7 +81,7 @@ struct RefreshRequest { static RefreshRequest* create(MockTestImageCtx &image_ctx, bool acquiring_lock, bool skip_open_parent, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -106,7 +106,7 @@ struct RemoveRequest { ProgressContext &prog_ctx, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -133,7 +133,7 @@ struct EnableRequest { const std::string &non_primary_global_image_id, MockContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/image/test_mock_DetachChildRequest.cc b/src/test/librbd/image/test_mock_DetachChildRequest.cc index 4167598c85c73..c63ae5ca81b32 100644 --- a/src/test/librbd/image/test_mock_DetachChildRequest.cc +++ b/src/test/librbd/image/test_mock_DetachChildRequest.cc @@ -20,7 +20,7 @@ struct MockTestImageCtx : public MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } diff --git a/src/test/librbd/image/test_mock_RefreshRequest.cc b/src/test/librbd/image/test_mock_RefreshRequest.cc index e0e3f3275e309..51340526558ab 100644 --- a/src/test/librbd/image/test_mock_RefreshRequest.cc +++ b/src/test/librbd/image/test_mock_RefreshRequest.cc @@ -43,14 +43,14 @@ struct RefreshParentRequest { const ParentInfo &parent_md, const MigrationInfo &migration_info, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } static bool is_refresh_required(MockRefreshImageCtx &mock_image_ctx, const ParentInfo& parent_md, const MigrationInfo &migration_info) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance->is_refresh_required(); } @@ -80,7 +80,7 @@ struct ImageDispatchSpec { static ImageDispatchSpec* create_flush_request( librbd::MockRefreshImageCtx &image_ctx, AioCompletion *aio_comp, FlushSource flush_source, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_comp = aio_comp; return s_instance; } diff --git a/src/test/librbd/image/test_mock_RemoveRequest.cc b/src/test/librbd/image/test_mock_RemoveRequest.cc index 54b5acf3a26ac..c9ea379653009 100644 --- a/src/test/librbd/image/test_mock_RemoveRequest.cc +++ b/src/test/librbd/image/test_mock_RemoveRequest.cc @@ -34,7 +34,7 @@ struct MockTestImageCtx : public MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -59,7 +59,7 @@ public: static DetachChildRequest *s_instance; static DetachChildRequest *create(MockTestImageCtx &image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -87,7 +87,7 @@ public: cls::rbd::SnapshotNamespace sn, std::string name, uint64_t id, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -110,7 +110,7 @@ public: static TrimRequest *create(MockTestImageCtx &image_ctx, Context *on_finish, uint64_t original_size, uint64_t new_size, ProgressContext &prog_ctx) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -140,7 +140,7 @@ public: static RemoveRequest *create(IoCtx &ioctx, const std::string &imageid, const std::string &client_id, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -168,7 +168,7 @@ public: static DisableRequest *create(MockTestImageCtx *image_ctx, bool force, bool remove, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -195,7 +195,7 @@ public: static ListWatchersRequest *create(MockTestImageCtx &image_ctx, int flags, std::list *watchers, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/io/test_mock_ImageRequestWQ.cc b/src/test/librbd/io/test_mock_ImageRequestWQ.cc index f54046f830045..b3c0042fc253a 100644 --- a/src/test/librbd/io/test_mock_ImageRequestWQ.cc +++ b/src/test/librbd/io/test_mock_ImageRequestWQ.cc @@ -45,7 +45,7 @@ struct ImageDispatchSpec { librbd::MockTestImageCtx &image_ctx, AioCompletion *aio_comp, Extents &&image_extents, bufferlist &&bl, int op_flags, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_comp = aio_comp; return s_instance; } @@ -53,7 +53,7 @@ struct ImageDispatchSpec { static ImageDispatchSpec* create_flush_request( librbd::MockTestImageCtx &image_ctx, AioCompletion *aio_comp, FlushSource flush_source, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_comp = aio_comp; return s_instance; } diff --git a/src/test/librbd/journal/test_mock_PromoteRequest.cc b/src/test/librbd/journal/test_mock_PromoteRequest.cc index 17120dc72c3bd..9fa503ee90307 100644 --- a/src/test/librbd/journal/test_mock_PromoteRequest.cc +++ b/src/test/librbd/journal/test_mock_PromoteRequest.cc @@ -36,7 +36,7 @@ struct OpenRequest { Mutex *lock, ImageClientMeta *client_meta, uint64_t *tag_tid, journal::TagData *tag_data, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); client_meta->tag_class = 456; tag_data->mirror_uuid = Journal<>::ORPHAN_MIRROR_UUID; *tag_tid = 567; diff --git a/src/test/librbd/journal/test_mock_Replay.cc b/src/test/librbd/journal/test_mock_Replay.cc index 5c82b552eb179..19b40ddc4d998 100644 --- a/src/test/librbd/journal/test_mock_Replay.cc +++ b/src/test/librbd/journal/test_mock_Replay.cc @@ -33,7 +33,7 @@ struct ImageRequest { static void aio_write(MockReplayImageCtx *ictx, AioCompletion *c, Extents &&image_extents, bufferlist &&bl, int op_flags, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_write(c, image_extents, bl, op_flags); } @@ -42,14 +42,14 @@ struct ImageRequest { static void aio_discard(MockReplayImageCtx *ictx, AioCompletion *c, Extents&& image_extents, bool skip_partial_discard, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_discard(c, image_extents, skip_partial_discard); } MOCK_METHOD1(aio_flush, void(AioCompletion *c)); static void aio_flush(MockReplayImageCtx *ictx, AioCompletion *c, FlushSource, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_flush(c); } @@ -59,7 +59,7 @@ struct ImageRequest { static void aio_writesame(MockReplayImageCtx *ictx, AioCompletion *c, Extents&& image_extents, bufferlist &&bl, int op_flags, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_writesame(c, image_extents, bl, op_flags); } @@ -70,7 +70,7 @@ struct ImageRequest { Extents &&image_extents, bufferlist &&cmp_bl, bufferlist &&bl, uint64_t *mismatch_offset, int op_flags, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_compare_and_write(c, image_extents, cmp_bl, bl, mismatch_offset, op_flags); } diff --git a/src/test/librbd/journal/test_mock_ResetRequest.cc b/src/test/librbd/journal/test_mock_ResetRequest.cc index 9a1640b57019b..446acdaa8b895 100644 --- a/src/test/librbd/journal/test_mock_ResetRequest.cc +++ b/src/test/librbd/journal/test_mock_ResetRequest.cc @@ -40,7 +40,7 @@ struct CreateRequest { uint64_t tag_class, TagData &tag_data, const std::string &client_id, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -60,7 +60,7 @@ struct RemoveRequest { static RemoveRequest* create(IoCtx &ioctx, const std::string &image_id, const std::string &client_id, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc index 986849e642841..b14a218208a63 100644 --- a/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_AcquireRequest.cc @@ -39,7 +39,7 @@ struct BreakRequest { EXPECT_EQ(cct->_conf.get_val("rbd_blacklist_expire_seconds"), (int)blacklist_expire_seconds); EXPECT_FALSE(force_break_lock); - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -59,7 +59,7 @@ struct GetLockerRequest { static GetLockerRequest* create(librados::IoCtx& ioctx, const std::string& oid, bool exclusive, Locker *locker, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->locker = locker; s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/librbd/managed_lock/test_mock_BreakRequest.cc b/src/test/librbd/managed_lock/test_mock_BreakRequest.cc index 80ddd750d17f0..efab85e944461 100644 --- a/src/test/librbd/managed_lock/test_mock_BreakRequest.cc +++ b/src/test/librbd/managed_lock/test_mock_BreakRequest.cc @@ -35,7 +35,7 @@ struct GetLockerRequest { static GetLockerRequest* create(librados::IoCtx& ioctx, const std::string& oid, bool exclusive, Locker *locker, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->locker = locker; s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/librbd/mirror/test_mock_DisableRequest.cc b/src/test/librbd/mirror/test_mock_DisableRequest.cc index e7a60e842a017..5af4e1c5a99f1 100644 --- a/src/test/librbd/mirror/test_mock_DisableRequest.cc +++ b/src/test/librbd/mirror/test_mock_DisableRequest.cc @@ -28,7 +28,7 @@ struct Journal { static Journal *s_instance; static void is_tag_owner(librbd::MockTestImageCtx *, bool *is_primary, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->is_tag_owner(is_primary, on_finish); } @@ -49,7 +49,7 @@ struct MirroringWatcher { const std::string &image_id, const std::string &global_image_id, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->notify_image_updated(mirror_image_state, image_id, global_image_id, on_finish); } @@ -74,7 +74,7 @@ struct PromoteRequest { static PromoteRequest *s_instance; static PromoteRequest *create(librbd::MockTestImageCtx *, bool force, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/mock/MockImageCtx.h b/src/test/librbd/mock/MockImageCtx.h index f123f41a61478..e0f11e950b519 100644 --- a/src/test/librbd/mock/MockImageCtx.h +++ b/src/test/librbd/mock/MockImageCtx.h @@ -35,7 +35,7 @@ struct MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } MOCK_METHOD0(destroy, void()); diff --git a/src/test/librbd/mock/MockJournal.h b/src/test/librbd/mock/MockJournal.h index 60a316bbf0af1..d641c50f35d11 100644 --- a/src/test/librbd/mock/MockJournal.h +++ b/src/test/librbd/mock/MockJournal.h @@ -20,7 +20,7 @@ struct ImageCtx; struct MockJournal { static MockJournal *s_instance; static MockJournal *get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } diff --git a/src/test/librbd/object_map/mock/MockInvalidateRequest.h b/src/test/librbd/object_map/mock/MockInvalidateRequest.h index 0702264449011..92f30748c42f9 100644 --- a/src/test/librbd/object_map/mock/MockInvalidateRequest.h +++ b/src/test/librbd/object_map/mock/MockInvalidateRequest.h @@ -18,7 +18,7 @@ struct MockInvalidateRequestBase { static InvalidateRequest* create(I &image_ctx, uint64_t snap_id, bool force, Context *on_finish) { - assert(!s_requests.empty()); + ceph_assert(!s_requests.empty()); InvalidateRequest* req = s_requests.front(); req->snap_id = snap_id; req->force = force; diff --git a/src/test/librbd/object_map/test_mock_RefreshRequest.cc b/src/test/librbd/object_map/test_mock_RefreshRequest.cc index 1bae4e72e9fbe..39bfab6756405 100644 --- a/src/test/librbd/object_map/test_mock_RefreshRequest.cc +++ b/src/test/librbd/object_map/test_mock_RefreshRequest.cc @@ -29,7 +29,7 @@ class LockRequest { public: static LockRequest *s_instance; static LockRequest *create(MockObjectMapImageCtx &image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -92,7 +92,7 @@ public: if (r < 0) { expect.WillOnce(Return(r)); } else { - assert(object_map); + ceph_assert(object_map); object_map->set_crc_enabled(false); bufferlist bl; diff --git a/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc b/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc index dcbfa2ec2aa8d..e78435869fc89 100644 --- a/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc +++ b/src/test/librbd/operation/test_mock_DisableFeaturesRequest.cc @@ -39,7 +39,7 @@ public: static SetFlagsRequest *create(MockOperationImageCtx *image_ctx, uint64_t flags, uint64_t mask, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -67,7 +67,7 @@ public: const std::string &client_id, MockContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -100,7 +100,7 @@ public: static DisableRequest *create(MockOperationImageCtx *image_ctx, bool force, bool remove, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -125,7 +125,7 @@ public: Context *on_finish = nullptr; static RemoveRequest *create(MockOperationImageCtx *image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc b/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc index 5085d04dfca6b..1bb9bdbde1dc9 100644 --- a/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc +++ b/src/test/librbd/operation/test_mock_EnableFeaturesRequest.cc @@ -39,7 +39,7 @@ public: static SetFlagsRequest *create(MockOperationImageCtx *image_ctx, uint64_t flags, uint64_t mask, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -70,7 +70,7 @@ public: const std::string &client_id, MockContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -95,7 +95,7 @@ public: Context *on_finish = nullptr; static EnableRequest *create(MockOperationImageCtx *image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -120,7 +120,7 @@ public: Context *on_finish = nullptr; static CreateRequest *create(MockOperationImageCtx *image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc index 85a22610e2bb4..931d5f4620e4d 100644 --- a/src/test/librbd/operation/test_mock_ResizeRequest.cc +++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc @@ -35,7 +35,7 @@ struct ImageDispatchSpec { static ImageDispatchSpec* create_flush_request( MockImageCtx &image_ctx, AioCompletion *aio_comp, FlushSource flush_source, const ZTracer::Trace &parent_trace) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->aio_comp = aio_comp; return s_instance; } @@ -60,7 +60,7 @@ public: static TrimRequest *create(MockImageCtx &image_ctx, Context *on_finish, uint64_t original_size, uint64_t new_size, ProgressContext &prog_ctx) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc index be63561ab4db1..36d74c0053e8a 100644 --- a/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotRemoveRequest.cc @@ -26,7 +26,7 @@ public: static DetachChildRequest *s_instance; static DetachChildRequest *create(MockImageCtx &image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc b/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc index 1d849928f52cf..1727180e63dc9 100644 --- a/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc +++ b/src/test/librbd/operation/test_mock_SnapshotRollbackRequest.cc @@ -36,9 +36,9 @@ struct ResizeRequest { uint64_t new_size, bool allow_shrink, ProgressContext &prog_ctx, uint64_t journal_op_tid, bool disable_journal) { - assert(s_instance != nullptr); - assert(journal_op_tid == 0); - assert(disable_journal); + ceph_assert(s_instance != nullptr); + ceph_assert(journal_op_tid == 0); + ceph_assert(disable_journal); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/test_fixture.cc b/src/test/librbd/test_fixture.cc index 9eee5f2f4a29f..ba6076c33754c 100644 --- a/src/test/librbd/test_fixture.cc +++ b/src/test/librbd/test_fixture.cc @@ -138,6 +138,6 @@ int TestFixture::acquire_exclusive_lock(librbd::ImageCtx &ictx) { } RWLock::RLocker owner_locker(ictx.owner_lock); - assert(ictx.exclusive_lock != nullptr); + ceph_assert(ictx.exclusive_lock != nullptr); return ictx.exclusive_lock->is_lock_owner() ? 0 : -EINVAL; } diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index 6d33b28393bcd..e71cb03ee2dfa 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -5075,12 +5075,12 @@ TEST_F(TestLibRBD, ObjectMapConsistentSnap) thread writer([&image1](){ librbd::image_info_t info; int r = image1.stat(info, sizeof(info)); - assert(r == 0); + ceph_assert(r == 0); bufferlist bl; bl.append("foo"); for (unsigned i = 0; i < info.num_objs; ++i) { r = image1.write((1 << info.order) * i, bl.length(), bl); - assert(r == (int) bl.length()); + ceph_assert(r == (int) bl.length()); } }); writer.join(); @@ -6995,7 +6995,7 @@ TEST_F(TestLibRBD, TestGetModifyTimestamp) rados_ioctx_destroy(ioctx); } -// poorman's assert() +// poorman's ceph_assert() namespace ceph { void __ceph_assert_fail(const char *assertion, const char *file, int line, const char *func) { diff --git a/src/test/librbd/test_mock_DeepCopyRequest.cc b/src/test/librbd/test_mock_DeepCopyRequest.cc index 682d0f61c15d1..31de7c67aea4e 100644 --- a/src/test/librbd/test_mock_DeepCopyRequest.cc +++ b/src/test/librbd/test_mock_DeepCopyRequest.cc @@ -45,7 +45,7 @@ public: const ObjectNumber &object_number, const SnapSeqs &snap_seqs, ProgressContext *prog_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -73,7 +73,7 @@ public: static MetadataCopyRequest* create(librbd::MockTestImageCtx *src_image_ctx, librbd::MockTestImageCtx *dst_image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -96,7 +96,7 @@ public: librados::snap_t snap_id_end, bool flatten, ContextWQ *work_queue, SnapSeqs *snap_seqs, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/librbd/test_mock_ExclusiveLock.cc b/src/test/librbd/test_mock_ExclusiveLock.cc index 3aa26f092e670..b867fcfc4b79f 100644 --- a/src/test/librbd/test_mock_ExclusiveLock.cc +++ b/src/test/librbd/test_mock_ExclusiveLock.cc @@ -92,7 +92,7 @@ struct BaseRequest { static T* create(MockExclusiveLockImageCtx &image_ctx, Context *on_lock_unlock, Context *on_finish) { - assert(!s_requests.empty()); + ceph_assert(!s_requests.empty()); T* req = s_requests.front(); req->on_lock_unlock = on_lock_unlock; req->on_finish = on_finish; diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc index bac9be185d5d1..027706a6c5d68 100644 --- a/src/test/librbd/test_mock_Journal.cc +++ b/src/test/librbd/test_mock_Journal.cc @@ -55,7 +55,7 @@ struct TypeTraits { struct MockReplay { static MockReplay *s_instance; static MockReplay &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -99,7 +99,7 @@ MockReplay *MockReplay::s_instance = nullptr; struct MockRemove { static MockRemove *s_instance; static MockRemove &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -129,7 +129,7 @@ MockRemove *MockRemove::s_instance = nullptr; struct MockCreate { static MockCreate *s_instance; static MockCreate &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -170,7 +170,7 @@ public: Mutex *lock, journal::ImageClientMeta *client_meta, uint64_t *tag_tid, journal::TagData *tag_data, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->tag_data = tag_data; s_instance->on_finish = on_finish; return s_instance; @@ -206,7 +206,7 @@ struct ObjectDispatch : public io::MockObjectDispatch { static ObjectDispatch* create(MockJournalImageCtx* image_ctx, Journal* journal) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -254,7 +254,7 @@ public: } ~TestMockJournal() override { - assert(m_commit_contexts.empty()); + ceph_assert(m_commit_contexts.empty()); } Mutex m_lock; diff --git a/src/test/librbd/test_mock_ManagedLock.cc b/src/test/librbd/test_mock_ManagedLock.cc index 4a911ed9c183d..0399fcd1480b6 100644 --- a/src/test/librbd/test_mock_ManagedLock.cc +++ b/src/test/librbd/test_mock_ManagedLock.cc @@ -48,7 +48,7 @@ struct BaseRequest { static T* create(librados::IoCtx& ioctx, MockImageWatcher *watcher, ContextWQ *work_queue, const std::string& oid, const std::string& cookie, Context *on_finish) { - assert(!s_requests.empty()); + ceph_assert(!s_requests.empty()); T* req = s_requests.front(); req->on_finish = on_finish; s_requests.pop_front(); @@ -106,11 +106,11 @@ struct GetLockerRequest { static GetLockerRequest* create(librados::IoCtx& ioctx, const std::string& oid, bool exclusive, Locker *locker, Context *on_finish) { - assert(0 == "unexpected call"); + ceph_assert(0 == "unexpected call"); } void send() { - assert(0 == "unexpected call"); + ceph_assert(0 == "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) { - assert(0 == "unexpected call"); + ceph_assert(0 == "unexpected call"); } void send() { - assert(0 == "unexpected call"); + ceph_assert(0 == "unexpected call"); } }; diff --git a/src/test/librbd/test_mock_ObjectMap.cc b/src/test/librbd/test_mock_ObjectMap.cc index 59f21ea431603..1d739a7c858c5 100644 --- a/src/test/librbd/test_mock_ObjectMap.cc +++ b/src/test/librbd/test_mock_ObjectMap.cc @@ -30,7 +30,7 @@ struct RefreshRequest { static RefreshRequest *create(MockTestImageCtx &image_ctx, ceph::BitVector<2u> *object_map, uint64_t snap_id, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; s_instance->object_map = object_map; return s_instance; @@ -49,7 +49,7 @@ struct UnlockRequest { static UnlockRequest *s_instance; static UnlockRequest *create(MockTestImageCtx &image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -72,7 +72,7 @@ struct UpdateRequest { const boost::optional ¤t_state, const ZTracer::Trace &parent_trace, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; s_instance->construct(snap_id, start_object_no, end_object_no, new_state, current_state); diff --git a/src/test/librbd/test_mock_ObjectWatcher.cc b/src/test/librbd/test_mock_ObjectWatcher.cc index b17a55f3979e5..74149258aac27 100644 --- a/src/test/librbd/test_mock_ObjectWatcher.cc +++ b/src/test/librbd/test_mock_ObjectWatcher.cc @@ -239,7 +239,7 @@ TEST_F(TestMockObjectWatcher, Reregister) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); // wait for recovery unwatch/watch @@ -269,7 +269,7 @@ TEST_F(TestMockObjectWatcher, ReregisterUnwatchError) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); // wait for recovery unwatch/watch @@ -300,7 +300,7 @@ TEST_F(TestMockObjectWatcher, ReregisterWatchError) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); // wait for recovery unwatch/watch @@ -333,7 +333,7 @@ TEST_F(TestMockObjectWatcher, ReregisterUnwatchPendingUnregister) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); ASSERT_EQ(0, unregister_ctx.wait()); @@ -363,7 +363,7 @@ TEST_F(TestMockObjectWatcher, ReregisterWatchPendingUnregister) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); ASSERT_EQ(0, unregister_ctx.wait()); @@ -395,7 +395,7 @@ TEST_F(TestMockObjectWatcher, ReregisterPendingUnregister) { mock_image_watcher.register_watch(®ister_ctx); ASSERT_EQ(0, register_ctx.wait()); - assert(m_watch_ctx != nullptr); + ceph_assert(m_watch_ctx != nullptr); m_watch_ctx->handle_error(0, -ESHUTDOWN); ASSERT_EQ(0, unregister_ctx.wait()); diff --git a/src/test/librbd/trash/test_mock_MoveRequest.cc b/src/test/librbd/trash/test_mock_MoveRequest.cc index 0165b3373ed94..7bd7dbfcb678b 100644 --- a/src/test/librbd/trash/test_mock_MoveRequest.cc +++ b/src/test/librbd/trash/test_mock_MoveRequest.cc @@ -21,7 +21,7 @@ struct MockTestImageCtx : public MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->construct(image_name, image_id); return s_instance; } diff --git a/src/test/messenger/message_helper.h b/src/test/messenger/message_helper.h index c65f42ee05a80..45b11c87a79cf 100644 --- a/src/test/messenger/message_helper.h +++ b/src/test/messenger/message_helper.h @@ -65,7 +65,7 @@ static inline Message* new_ping_with_data(const char *tag, uint32_t size) struct xio_reg_mem *mp = m->get_mp(); int e = xio_mempool_alloc(xio_msgr_mpool, size, mp); - assert(e == 0); + ceph_assert(e == 0); p = mp->addr; m->set_rdma_hook(xio_hook_func); diff --git a/src/test/mon/PGMap.cc b/src/test/mon/PGMap.cc index d4fd66e897817..2d6fd4522f170 100644 --- a/src/test/mon/PGMap.cc +++ b/src/test/mon/PGMap.cc @@ -31,8 +31,8 @@ namespace { } } const string& get(unsigned r, unsigned c) const { - assert(r < row.size()); - assert(c < row[r].size()); + ceph_assert(r < row.size()); + ceph_assert(c < row[r].size()); return row[r][c]; } }; diff --git a/src/test/mon/test-mon-msg.cc b/src/test/mon/test-mon-msg.cc index 0afa9844395eb..4c6be5af9d0aa 100644 --- a/src/test/mon/test-mon-msg.cc +++ b/src/test/mon/test-mon-msg.cc @@ -83,7 +83,7 @@ public: std::string public_msgr_type = cct->_conf->ms_public_type.empty() ? cct->_conf.get_val("ms_type") : cct->_conf->ms_public_type; msg = Messenger::create(cct, public_msgr_type, entity_name_t::CLIENT(-1), "test-mon-msg", 0, 0); - assert(msg != NULL); + ceph_assert(msg != NULL); msg->set_default_policy(Messenger::Policy::lossy_client(0)); dout(0) << __func__ << " starting messenger at " << msg->get_myaddr() << dendl; @@ -93,7 +93,7 @@ public: int init_monc() { dout(1) << __func__ << dendl; - assert(msg != NULL); + ceph_assert(msg != NULL); int err = monc.build_initial_monmap(); if (err < 0) { derr << __func__ << " error building monmap: " diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 41751e9e6e470..92f16462c448c 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -253,7 +253,7 @@ class ClientStub : public TestStub } messenger.reset(Messenger::create_client_messenger(cct, "stubclient")); - assert(messenger.get() != NULL); + ceph_assert(messenger.get() != NULL); messenger->set_default_policy( Messenger::Policy::lossy_client(CEPH_FEATURE_OSDREPLYMUX)); @@ -261,7 +261,7 @@ class ClientStub : public TestStub << messenger->get_myaddr() << dendl; objecter.reset(new Objecter(cct, messenger.get(), &monc, NULL, 0, 0)); - assert(objecter.get() != NULL); + ceph_assert(objecter.get() != NULL); objecter->set_balanced_budget(); monc.set_messenger(messenger.get()); @@ -421,7 +421,7 @@ class OSDStub : public TestStub monc.shutdown(); return err; } - assert(!monc.get_fsid().is_zero()); + ceph_assert(!monc.get_fsid().is_zero()); monc.wait_auth_rotating(30.0); @@ -556,7 +556,7 @@ class OSDStub : public TestStub if (pgs.count(pgid) == 0) { derr << __func__ << " pgid " << pgid << " not on our map" << dendl; - assert(0 == "pgid not on our map"); + ceph_assert(0 == "pgid not on our map"); } pg_stat_t &s = pgs[pgid]; mstats->pg_stat[pgid] = s; @@ -575,7 +575,7 @@ class OSDStub : public TestStub void modify_pg(pg_t pgid) { dout(10) << __func__ << " pg " << pgid << dendl; - assert(pgs.count(pgid) > 0); + ceph_assert(pgs.count(pgid) > 0); pg_stat_t &s = pgs[pgid]; utime_t now = ceph_clock_now(); @@ -622,7 +622,7 @@ class OSDStub : public TestStub ++it; ++pgs_at; } - assert(it != pgs.end()); + ceph_assert(it != pgs.end()); dout(20) << __func__ << " pg at pos " << at << ": " << it->first << dendl; modify_pg(it->first); @@ -749,7 +749,7 @@ class OSDStub : public TestStub } void handle_pg_create(MOSDPGCreate *m) { - assert(m != NULL); + ceph_assert(m != NULL); if (m->epoch < osdmap.get_epoch()) { std::cout << __func__ << " epoch " << m->epoch << " < " << osdmap.get_epoch() << "; dropping" << std::endl; @@ -786,7 +786,7 @@ class OSDStub : public TestStub << dendl; dout(0) << monc.get_monmap() << dendl; } - assert(m->fsid == monc.get_fsid()); + ceph_assert(m->fsid == monc.get_fsid()); epoch_t first = m->get_first(); epoch_t last = m->get_last(); @@ -847,7 +847,7 @@ class OSDStub : public TestStub derr << "osd." << whoami << "::" << __func__ << "** ERROR: applying incremental: " << cpp_strerror(err) << dendl; - assert(0 == "error applying incremental"); + ceph_assert(0 == "error applying incremental"); } } dout(30) << __func__ << "\nosdmap:\n"; @@ -949,7 +949,7 @@ void handle_test_signal(int signum) } void usage() { - assert(our_name != NULL); + ceph_assert(our_name != NULL); std::cout << "usage: " << our_name << " <--stub-id ID> [--stub-id ID...]" diff --git a/src/test/msgr/perf_msgr_server.cc b/src/test/msgr/perf_msgr_server.cc index fc7ff16ca4b38..e70b94e47c70e 100644 --- a/src/test/msgr/perf_msgr_server.cc +++ b/src/test/msgr/perf_msgr_server.cc @@ -64,7 +64,7 @@ class ServerDispatcher : public Dispatcher { } void _process_finish(Message *m) override { } void _clear() override { - assert(messages.empty()); + ceph_assert(messages.empty()); } } op_wq; diff --git a/src/test/msgr/test_async_driver.cc b/src/test/msgr/test_async_driver.cc index 0a2333618bf81..08d35a0e1922b 100644 --- a/src/test/msgr/test_async_driver.cc +++ b/src/test/msgr/test_async_driver.cc @@ -149,12 +149,12 @@ void* echoclient(void *arg) sa.sin_port = htons(port); char addr[] = "127.0.0.1"; int r = inet_pton(AF_INET, addr, &sa.sin_addr); - assert(r == 1); + ceph_assert(r == 1); int connect_sd = ::socket(AF_INET, SOCK_STREAM, 0); if (connect_sd >= 0) { r = connect(connect_sd, (struct sockaddr*)&sa, sizeof(sa)); - assert(r == 0); + ceph_assert(r == 0); int t = 0; do { diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index c4cafa9c02285..667f165e67e33 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -186,11 +186,11 @@ class FakeDispatcher : public Dispatcher { lderr(g_ceph_context) << __func__ << " conn: " << m->get_connection() << " session " << s << " count: " << s->count << dendl; if (is_server) { if (loopback) - assert(m->get_source().is_osd()); + ceph_assert(m->get_source().is_osd()); else reply_message(m); } else if (loopback) { - assert(m->get_source().is_client()); + ceph_assert(m->get_source().is_client()); } m->put(); Mutex::Locker l(lock); @@ -1004,7 +1004,7 @@ class SyntheticWorkload { msgr->bind(bind_addr); msgr->add_dispatcher_head(&dispatcher); - assert(msgr); + ceph_assert(msgr); msgr->set_default_policy(srv_policy); available_servers.insert(msgr); msgr->start(); @@ -1020,7 +1020,7 @@ class SyntheticWorkload { } msgr->add_dispatcher_head(&dispatcher); - assert(msgr); + ceph_assert(msgr); msgr->set_default_policy(cli_policy); available_clients.insert(msgr); msgr->start(); @@ -1048,7 +1048,7 @@ class SyntheticWorkload { usleep(500); lock.Lock(); } - assert(lock.is_locked()); + ceph_assert(lock.is_locked()); boost::uniform_int<> choose(0, available_connections.size() - 1); int index = choose(rng); map >::iterator i = available_connections.begin(); @@ -1159,7 +1159,7 @@ class SyntheticWorkload { if (i++ % 50 == 0) print_internal_state(true); if (timeout_us < 0) - assert(0 == " loop time exceed 5 mins, it looks we stuck into some problems!"); + ceph_assert(0 == " 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/multi_stress_watch.cc b/src/test/multi_stress_watch.cc index 51e8f73850b41..a8c690f391ed0 100644 --- a/src/test/multi_stress_watch.cc +++ b/src/test/multi_stress_watch.cc @@ -55,10 +55,10 @@ test_loop(Rados &cluster, std::string pool_name, std::string obj_name) uint64_t handle; WatchNotifyTestCtx ctx; ret = ioctx.watch(obj_name, 0, &handle, &ctx); - assert(!ret); + ceph_assert(!ret); bufferlist bl2; ret = ioctx.notify(obj_name, 0, bl2); - assert(!ret); + ceph_assert(!ret); TestAlarm alarm; sem_wait(&sem); ioctx.unwatch(obj_name, handle); diff --git a/src/test/objectstore/Allocator_bench.cc b/src/test/objectstore/Allocator_bench.cc index 8b6563387d6fa..7b0883ae2725f 100755 --- a/src/test/objectstore/Allocator_bench.cc +++ b/src/test/objectstore/Allocator_bench.cc @@ -70,8 +70,8 @@ public: AllocTracker(uint64_t capacity, uint64_t alloc_unit) : u1(0, capacity) { - assert(alloc_unit >= 0x100); - assert(capacity <= (uint64_t(1) << 48)); // we use 5 octets (bytes 1 - 5) to store + ceph_assert(alloc_unit >= 0x100); + ceph_assert(capacity <= (uint64_t(1) << 48)); // we use 5 octets (bytes 1 - 5) to store // offset to save the required space. // This supports capacity up to 281 TB @@ -89,9 +89,9 @@ public: bool push(uint64_t offs, uint32_t len) { - assert((len & 0xff) == 0); - assert((offs & 0xff) == 0); - assert((offs & 0xffff000000000000) == 0); + ceph_assert((len & 0xff) == 0); + ceph_assert((offs & 0xff) == 0); + ceph_assert((offs & 0xffff000000000000) == 0); if (head + 1 == tail) return false; diff --git a/src/test/objectstore/DeterministicOpSequence.cc b/src/test/objectstore/DeterministicOpSequence.cc index 91390a6db2918..ddff7a0170606 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; - assert(0 == "bad op"); + ceph_assert(0 == "bad op"); } return ok; } diff --git a/src/test/objectstore/FileStoreTracker.cc b/src/test/objectstore/FileStoreTracker.cc index bd634cec17cdb..dfaa88d1fef2c 100644 --- a/src/test/objectstore/FileStoreTracker.cc +++ b/src/test/objectstore/FileStoreTracker.cc @@ -98,7 +98,7 @@ void FileStoreTracker::write(const pair &obj, for (uint64_t i = offset; i < offset + len; ++i, ++iter) { - assert(iter.valid()); + ceph_assert(iter.valid()); to_write.append(*iter); } out->t->write(coll_t(obj.first), @@ -128,7 +128,7 @@ void FileStoreTracker::clone_range(const pair &from, OutTransaction *out) { Mutex::Locker l(lock); std::cerr << "CloningRange " << from << " to " << to << std::endl; - assert(from.first == to.first); + ceph_assert(from.first == to.first); ObjectContents from_contents = get_current_content(from); ObjectContents to_contents = get_current_content(to); if (!from_contents.exists()) { @@ -159,7 +159,7 @@ void FileStoreTracker::clone(const pair &from, OutTransaction *out) { Mutex::Locker l(lock); std::cerr << "Cloning " << from << " to " << to << std::endl; - assert(from.first == to.first); + ceph_assert(from.first == to.first); if (from.second == to.second) { return; } @@ -342,7 +342,7 @@ ObjectContents FileStoreTracker::get_current_content( auto bp = bl.cbegin(); pair val; decode(val, bp); - assert(seq_to_key(val.first) == iter->key()); + ceph_assert(seq_to_key(val.first) == iter->key()); bp = val.second.begin(); return ObjectContents(bp); } @@ -362,7 +362,7 @@ ObjectContents FileStoreTracker::get_content( auto bp = got.begin()->second.cbegin(); decode(val, bp); bp = val.second.begin(); - assert(val.first == version); + ceph_assert(val.first == version); return ObjectContents(bp); } @@ -404,7 +404,7 @@ void FileStoreTracker::committed(const pair &obj, uint64_t seq) { Mutex::Locker l(lock); ObjStatus status = get_obj_status(obj, db); - assert(status.last_committed < seq); + ceph_assert(status.last_committed < seq); status.last_committed = seq; KeyValueDB::Transaction t = db->get_transaction(); clear_obsolete(obj, status, db, t); @@ -417,7 +417,7 @@ void FileStoreTracker::applied(const pair &obj, Mutex::Locker l(lock); std::cerr << "Applied " << obj << " version " << seq << std::endl; ObjStatus status = get_obj_status(obj, db); - assert(status.last_applied < seq); + ceph_assert(status.last_applied < seq); status.set_last_applied(seq, restart_seq); KeyValueDB::Transaction t = db->get_transaction(); clear_obsolete(obj, status, db, t); diff --git a/src/test/objectstore/TestObjectStoreState.cc b/src/test/objectstore/TestObjectStoreState.cc index 61cba8d9cecbb..52d2ab60b7da7 100644 --- a/src/test/objectstore/TestObjectStoreState.cc +++ b/src/test/objectstore/TestObjectStoreState.cc @@ -125,7 +125,7 @@ TestObjectStoreState::get_coll_at(int pos, bool erase) if (m_collections.empty()) return NULL; - assert((size_t) pos < m_collections_ids.size()); + ceph_assert((size_t) pos < m_collections_ids.size()); coll_t cid = m_collections_ids[pos]; coll_entry_t *entry = m_collections[cid]; diff --git a/src/test/objectstore/chain_xattr.cc b/src/test/objectstore/chain_xattr.cc index 76e7a6c5777fb..a928464af7473 100644 --- a/src/test/objectstore/chain_xattr.cc +++ b/src/test/objectstore/chain_xattr.cc @@ -325,7 +325,7 @@ list get_xattrs(int fd) while (len > 0) { size_t next_len = strlen(buf); ret.push_back(string(buf, buf + next_len)); - assert(len >= (int)(next_len + 1)); + ceph_assert(len >= (int)(next_len + 1)); buf += (next_len + 1); len -= (next_len + 1); } @@ -348,7 +348,7 @@ TEST(chain_xattr, fskip_chain_cleanup_and_ensure_single_attr) const char *file = FILENAME; ::unlink(file); int fd = ::open(file, O_CREAT|O_RDWR|O_TRUNC, 0700); - assert(fd >= 0); + ceph_assert(fd >= 0); std::size_t existing_xattrs = get_xattrs(fd).size(); char buf[800]; @@ -393,7 +393,7 @@ TEST(chain_xattr, skip_chain_cleanup_and_ensure_single_attr) const char *file = FILENAME; ::unlink(file); int fd = ::open(file, O_CREAT|O_RDWR|O_TRUNC, 0700); - assert(fd >= 0); + ceph_assert(fd >= 0); std::size_t existing_xattrs = get_xattrs(fd).size(); ::close(fd); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 57b9896965316..7213867192be5 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -3438,7 +3438,7 @@ public: bufferlist r2; r = state->store->read(state->ch, hoid, 0, state->contents[hoid].data.length(), r2); - assert(bl_eq(state->contents[hoid].data, r2)); + ceph_assert(bl_eq(state->contents[hoid].data, r2)); state->cond.Signal(); } }; @@ -3465,7 +3465,7 @@ public: r = state->store->read( state->ch, noid, 0, state->contents[noid].data.length(), r2); - assert(bl_eq(state->contents[noid].data, r2)); + ceph_assert(bl_eq(state->contents[noid].data, r2)); state->cond.Signal(); } }; @@ -3492,7 +3492,7 @@ public: --(state->in_flight); bufferlist r2; r = state->store->read(state->ch, noid, 0, state->contents[noid].data.length(), r2); - assert(bl_eq(state->contents[noid].data, r2)); + ceph_assert(bl_eq(state->contents[noid].data, r2)); state->cond.Signal(); } }; @@ -3538,7 +3538,7 @@ public: vector objects; int r = store->collection_list(ch, ghobject_t(), ghobject_t::get_max(), 10, &objects, 0); - assert(r >= 0); + ceph_assert(r >= 0); if (objects.empty()) break; ObjectStore::Transaction t; @@ -3797,7 +3797,7 @@ public: } } else { bufferlist value; - assert(dstdata.length() > dstoff); + ceph_assert(dstdata.length() > dstoff); dstdata.copy(0, dstoff, value); value.append(bl); if (value.length() < dstdata.length()) @@ -3843,7 +3843,7 @@ public: } } else { bufferlist value; - assert(data.length() > offset); + ceph_assert(data.length() > offset); data.copy(0, offset, value); value.append(bl); if (value.length() < data.length()) @@ -3969,7 +3969,7 @@ public: size_t max_len = expected.length() - offset; if (len > max_len) len = max_len; - assert(len == result.length()); + ceph_assert(len == result.length()); ASSERT_EQ(len, result.length()); expected.copy(offset, len, bl); ASSERT_EQ(r, (int)len); @@ -4132,7 +4132,7 @@ public: ch.reset(); store->umount(); int r = store->fsck(deep); - assert(r == 0 || r == -EOPNOTSUPP); + ceph_assert(r == 0 || r == -EOPNOTSUPP); store->mount(); ch = store->open_collection(cid); } @@ -4171,7 +4171,7 @@ public: cerr << "- " << *p << std::endl; //cerr << " objects_set: " << objects_set << std::endl; //cerr << " available_set: " << available_objects << std::endl; - assert(0 == "badness"); + ceph_assert(0 == "badness"); } ASSERT_EQ(objects_set.size(), available_objects.size()); @@ -4214,7 +4214,7 @@ public: struct stat buf; int r = store->stat(ch, hoid, &buf); ASSERT_EQ(0, r); - assert((uint64_t)buf.st_size == expected); + ceph_assert((uint64_t)buf.st_size == expected); ASSERT_TRUE((uint64_t)buf.st_size == expected); { Mutex::Locker locker(lock); diff --git a/src/test/objectstore/store_test_fixture.cc b/src/test/objectstore/store_test_fixture.cc index 0e590c9b3fa55..33d4618a31b00 100644 --- a/src/test/objectstore/store_test_fixture.cc +++ b/src/test/objectstore/store_test_fixture.cc @@ -79,7 +79,7 @@ void StoreTestFixture::TearDown() void StoreTestFixture::SetVal(ConfigProxy& _conf, const char* key, const char* val) { - assert(!conf || conf == &_conf); + ceph_assert(!conf || conf == &_conf); conf = &_conf; std::string skey(key); std::string prev_val; @@ -91,7 +91,7 @@ void StoreTestFixture::SetVal(ConfigProxy& _conf, const char* key, const char* v void StoreTestFixture::PopSettings(size_t pos) { if (conf) { - assert(pos == 0 || pos <= saved_settings.size()); // for sanity + ceph_assert(pos == 0 || pos <= saved_settings.size()); // for sanity while(pos < saved_settings.size()) { auto& e = saved_settings.top(); diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc index aa6cd57137452..28e67aa032e28 100644 --- a/src/test/objectstore/test_bluefs.cc +++ b/src/test/objectstore/test_bluefs.cc @@ -23,9 +23,9 @@ string get_temp_bdev(uint64_t size) string fn = "ceph_test_bluefs.tmp.block." + stringify(getpid()) + "." + stringify(++n); int fd = ::open(fn.c_str(), O_CREAT|O_RDWR|O_TRUNC, 0644); - assert(fd >= 0); + ceph_assert(fd >= 0); int r = ::ftruncate(fd, size); - assert(r >= 0); + ceph_assert(r >= 0); ::close(fd); return fn; } diff --git a/src/test/objectstore/test_idempotent.cc b/src/test/objectstore/test_idempotent.cc index a9ef77c853085..c89ea9b70fe55 100644 --- a/src/test/objectstore/test_idempotent.cc +++ b/src/test/objectstore/test_idempotent.cc @@ -65,7 +65,7 @@ int main(int argc, char **argv) { if (string(args[0]) == string("new")) start_new = true; KeyValueDB *_db = KeyValueDB::create(g_ceph_context, "leveldb", db_path); - assert(!_db->create_and_open(std::cerr)); + ceph_assert(!_db->create_and_open(std::cerr)); boost::scoped_ptr db(_db); boost::scoped_ptr store(new FileStore(cct.get(), store_path, store_dev)); @@ -75,14 +75,14 @@ int main(int argc, char **argv) { if (start_new) { std::cerr << "mkfs" << std::endl; - assert(!store->mkfs()); + ceph_assert(!store->mkfs()); ObjectStore::Transaction t; - assert(!store->mount()); + ceph_assert(!store->mount()); ch = store->create_new_collection(coll); t.create_collection(coll, 0); store->queue_transaction(ch, std::move(t)); } else { - assert(!store->mount()); + ceph_assert(!store->mount()); ch = store->open_collection(coll); } diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc index 33608c2bb3ff2..3d21fe2640928 100644 --- a/src/test/objectstore/test_idempotent_sequence.cc +++ b/src/test/objectstore/test_idempotent_sequence.cc @@ -33,7 +33,7 @@ #define dout_prefix *_dout << "test_idempotent_sequence " void usage(const char *name, std::string command = "") { - assert(name != NULL); + ceph_assert(name != NULL); std::string more = "cmd "; std::string diff = "diff "; diff --git a/src/test/objectstore_bench.cc b/src/test/objectstore_bench.cc index 294679dfa30dd..b04e2d8c141ea 100644 --- a/src/test/objectstore_bench.cc +++ b/src/test/objectstore_bench.cc @@ -104,11 +104,11 @@ void osbench_worker(ObjectStore *os, const Config &cfg, dout(0) << "Writing " << cfg.size << " in blocks of " << cfg.block_size << dendl; - assert(starting_offset < cfg.size); - assert(starting_offset % cfg.block_size == 0); + ceph_assert(starting_offset < cfg.size); + ceph_assert(starting_offset % cfg.block_size == 0); ObjectStore::CollectionHandle ch = os->open_collection(cid); - assert(ch); + ceph_assert(ch); for (int i = 0; i < cfg.repeats; ++i) { uint64_t offset = starting_offset; @@ -283,7 +283,7 @@ int main(int argc, const char *argv[]) ObjectStore::Transaction t; t.touch(cid, oids[i]); int r = os->queue_transaction(ch, std::move(t)); - assert(r == 0); + ceph_assert(r == 0); } } else { oids.emplace_back(hobject_t(sobject_t("osbench", CEPH_NOSNAP))); @@ -291,7 +291,7 @@ int main(int argc, const char *argv[]) ObjectStore::Transaction t; t.touch(cid, oids.back()); int r = os->queue_transaction(ch, std::move(t)); - assert(r == 0); + ceph_assert(r == 0); } // run the worker threads diff --git a/src/test/omap_bench.cc b/src/test/omap_bench.cc index a6305378106d3..a0ddbef055c38 100644 --- a/src/test/omap_bench.cc +++ b/src/test/omap_bench.cc @@ -371,11 +371,11 @@ int OmapBench::test_write_objects_in_parallel(omap_generator_t omap_gen) { Mutex::Locker l(thread_is_free_lock); for (int i = 0; i < objects; i++) { - assert(busythreads_count <= threads); + ceph_assert(busythreads_count <= threads); //wait for a writer to be free if (busythreads_count == threads) { int err = thread_is_free.Wait(thread_is_free_lock); - assert(busythreads_count < threads); + ceph_assert(busythreads_count < threads); if (err < 0) { return err; } diff --git a/src/test/on_exit.cc b/src/test/on_exit.cc index 50721ac0da70a..36491c3fd3ccc 100644 --- a/src/test/on_exit.cc +++ b/src/test/on_exit.cc @@ -60,30 +60,30 @@ static void call_exit() int main(int argc, char **argv) { // test basic function scope behavior - assert(func_scope_val == 0); + ceph_assert(func_scope_val == 0); func_scope(); - assert(func_scope_val == 8); + ceph_assert(func_scope_val == 8); // shared mem for exit tests shared_val = (int*)mmap(NULL, sizeof(int), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANONYMOUS, -1, 0); - assert(shared_val != MAP_FAILED); + ceph_assert(shared_val != MAP_FAILED); // test normal exit returning from main *shared_val = 0; int pid = fork(); - assert(pid >= 0); + ceph_assert(pid >= 0); if (pid) { int status; int ret = waitpid(pid, &status, 0); - assert(ret == pid); // should be our child - assert(status == 0); - assert(*shared_val == MAIN_SCOPE_VAL); + ceph_assert(ret == pid); // should be our child + ceph_assert(status == 0); + ceph_assert(*shared_val == MAIN_SCOPE_VAL); } else { // child adds a callback to the static scope callback manager and then // exits by returning from main. The parent checks the value after the // child exits via the memory map. - assert(*shared_val == 0); + ceph_assert(*shared_val == 0); int *new_val = (int*)malloc(sizeof(*new_val)); *new_val = MAIN_SCOPE_VAL; main_scope_mgr.add_callback(main_scope_cb, new_val); @@ -93,17 +93,17 @@ int main(int argc, char **argv) // test exit via exit() *shared_val = 0; pid = fork(); - assert(pid >= 0); + ceph_assert(pid >= 0); if (pid) { int status; int ret = waitpid(pid, &status, 0); - assert(ret == pid); // should be our child - assert(WEXITSTATUS(status) == 3); - assert(*shared_val == EXIT_FUNC_VAL); + ceph_assert(ret == pid); // should be our child + ceph_assert(WEXITSTATUS(status) == 3); + ceph_assert(*shared_val == EXIT_FUNC_VAL); } else { // child adds a callback to the static scope callback manager and then // exits via exit(). - assert(*shared_val == 0); + ceph_assert(*shared_val == 0); int *new_val = (int*)malloc(sizeof(*new_val)); *new_val = EXIT_FUNC_VAL; exit_func_mgr.add_callback(exit_func_cb, new_val); diff --git a/src/test/os/TestLFNIndex.cc b/src/test/os/TestLFNIndex.cc index 1b51857d91efd..c5a953a64ff12 100644 --- a/src/test/os/TestLFNIndex.cc +++ b/src/test/os/TestLFNIndex.cc @@ -282,7 +282,7 @@ TEST_F(TestLFNIndex, remove_object) { EXPECT_EQ(0, exists); std::string pathname_1("PATH_1/" + mangled_name_1); auto retvalue = ::creat(pathname_1.c_str(), 0600); - assert(retvalue > 2); + ceph_assert(retvalue > 2); EXPECT_EQ(0, ::close(retvalue)); EXPECT_EQ(0, created(hoid, pathname_1.c_str())); @@ -422,7 +422,7 @@ TEST_F(TestLFNIndex, get_mangled_name) { mangled_name.clear(); exists = 666; auto retvalue = ::creat(pathname.c_str(), 0600); - assert(retvalue > 2); + ceph_assert(retvalue > 2); EXPECT_EQ(0, ::close(retvalue)); EXPECT_EQ(0, created(hoid, pathname.c_str())); EXPECT_EQ(0, get_mangled_name(path, hoid, &mangled_name, &exists)); diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc index d48bc04950bfb..12f946f5650b2 100644 --- a/src/test/osd/Object.cc +++ b/src/test/osd/Object.cc @@ -47,12 +47,12 @@ void AppendGenerator::get_ranges_map( uint64_t segment_length = round_up( rand() % (max_append_size - min_append_size), alignment) + min_append_size; - assert(segment_length >= min_append_size); + ceph_assert(segment_length >= min_append_size); if (segment_length + pos > limit) { segment_length = limit - pos; } if (alignment) - assert(segment_length % alignment == 0); + ceph_assert(segment_length % alignment == 0); out.insert(std::pair(pos, segment_length)); pos += segment_length; } @@ -66,8 +66,8 @@ void VarLenGenerator::get_ranges_map( bool include = false; while (pos < limit) { uint64_t segment_length = (rand() % (max_stride_size - min_stride_size)) + min_stride_size; - assert(segment_length < max_stride_size); - assert(segment_length >= min_stride_size); + ceph_assert(segment_length < max_stride_size); + ceph_assert(segment_length >= min_stride_size); if (segment_length + pos > limit) { segment_length = limit - pos; } @@ -83,7 +83,7 @@ void VarLenGenerator::get_ranges_map( void ObjectDesc::iterator::adjust_stack() { while (!stack.empty() && pos >= stack.front().second.next) { - assert(pos == stack.front().second.next); + ceph_assert(pos == stack.front().second.next); size = stack.front().second.size; current = stack.front().first; stack.pop_front(); @@ -166,7 +166,7 @@ bool ObjectDesc::check_sparse(const std::map& extents, } } - assert(off <= to_check.length()); + ceph_assert(off <= to_check.length()); pos = extiter.first; objiter.seek(pos); diff --git a/src/test/osd/Object.h b/src/test/osd/Object.h index f73abe5291a3a..b0ff84d1c4fd3 100644 --- a/src/test/osd/Object.h +++ b/src/test/osd/Object.h @@ -263,7 +263,7 @@ public: for (iterator i = get_iterator(in); !i.end(); ++i) { bl.append(*i); } - assert(bl.length() < big_max_len); + ceph_assert(bl.length() < big_max_len); return bl; } }; @@ -353,12 +353,12 @@ public: } uint64_t next(uint64_t pos) { - assert(!covers(pos)); + ceph_assert(!covers(pos)); return ranges.starts_after(pos) ? ranges.start_after(pos) : size; } uint64_t valid_till(uint64_t pos) { - assert(covers(pos)); + ceph_assert(covers(pos)); return ranges.contains(pos) ? ranges.end_after(pos) : std::numeric_limits::max(); @@ -387,7 +387,7 @@ public: void adjust_stack(); iterator &operator++() { - assert(cur_valid_till >= pos); + ceph_assert(cur_valid_till >= pos); ++pos; if (pos >= cur_valid_till) { adjust_stack(); @@ -412,22 +412,22 @@ public: ceph_abort(); } while (pos < _pos) { - assert(cur_valid_till >= pos); + ceph_assert(cur_valid_till >= pos); uint64_t next = std::min(_pos - pos, cur_valid_till - pos); pos += next; if (pos >= cur_valid_till) { - assert(pos == cur_valid_till); + ceph_assert(pos == cur_valid_till); adjust_stack(); } } - assert(pos == _pos); + ceph_assert(pos == _pos); } bufferlist gen_bl_advance(uint64_t s) { bufferlist ret; while (s > 0) { - assert(cur_valid_till >= pos); + ceph_assert(cur_valid_till >= pos); uint64_t next = std::min(s, cur_valid_till - pos); if (current != layers.end() && pos < size) { ret.append(current->iter.gen_bl_advance(next)); @@ -436,11 +436,11 @@ public: } pos += next; - assert(next <= s); + ceph_assert(next <= s); s -= next; if (pos >= cur_valid_till) { - assert(cur_valid_till == pos); + ceph_assert(cur_valid_till == pos); adjust_stack(); } } @@ -450,7 +450,7 @@ public: bool check_bl_advance(bufferlist &bl, uint64_t *error_at = nullptr) { uint64_t off = 0; while (off < bl.length()) { - assert(cur_valid_till >= pos); + ceph_assert(cur_valid_till >= pos); uint64_t next = std::min(bl.length() - off, cur_valid_till - pos); bufferlist to_check; @@ -474,14 +474,14 @@ public: pos += next; off += next; - assert(off <= bl.length()); + ceph_assert(off <= bl.length()); if (pos >= cur_valid_till) { - assert(cur_valid_till == pos); + ceph_assert(cur_valid_till == pos); adjust_stack(); } } - assert(off == bl.length()); + ceph_assert(off == bl.length()); return true; } }; diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 93f3a74a87866..11eab51ce7b0a 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -271,7 +271,7 @@ public: stringstream hostpid; hostpid << hostname_cstr << getpid() << "-"; prefix = hostpid.str(); - assert(!initialized); + ceph_assert(!initialized); initialized = true; return 0; } @@ -285,7 +285,7 @@ public: void loop(TestOpGenerator *gen) { - assert(initialized); + ceph_assert(initialized); list inflight; state_lock.Lock(); @@ -349,12 +349,12 @@ public: } TestWatchContext *watch(const string &oid) { - assert(!watches.count(oid)); + ceph_assert(!watches.count(oid)); return (watches[oid] = new TestWatchContext); } void unwatch(const string &oid) { - assert(watches.count(oid)); + ceph_assert(watches.count(oid)); delete watches[oid]; watches.erase(oid); } @@ -473,7 +473,7 @@ public: void remove_object(const string &oid) { - assert(!get_watch_context(oid)); + ceph_assert(!get_watch_context(oid)); ObjectDesc new_obj; pool_obj_cont[current_snap].erase(oid); pool_obj_cont[current_snap].insert(pair(oid, new_obj)); @@ -525,9 +525,9 @@ public: void remove_snap(int snap) { map >::iterator next_iter = pool_obj_cont.find(snap); - assert(next_iter != pool_obj_cont.end()); + ceph_assert(next_iter != pool_obj_cont.end()); map >::iterator current_iter = next_iter++; - assert(current_iter != pool_obj_cont.end()); + ceph_assert(current_iter != pool_obj_cont.end()); map ¤t = current_iter->second; map &next = next_iter->second; for (map::iterator i = current.begin(); @@ -551,7 +551,7 @@ public: void roll_back(const string &oid, int snap) { - assert(!get_watch_context(oid)); + ceph_assert(!get_watch_context(oid)); ObjectDesc contents; find_object(oid, &contents, snap); contents.dirty = true; @@ -797,12 +797,12 @@ public: 0; bool requires; int r = context->io_ctx.pool_requires_alignment2(&requires); - assert(r == 0); + ceph_assert(r == 0); uint64_t alignment = 0; if (requires) { r = context->io_ctx.pool_required_alignment2(&alignment); - assert(r == 0); - assert(alignment != 0); + ceph_assert(r == 0); + ceph_assert(alignment != 0); } cont_gen = new AppendGenerator( prev_length, @@ -833,8 +833,8 @@ public: ++i, ++tid) { gen_pos.seek(i->first); bufferlist to_write = gen_pos.gen_bl_advance(i->second); - assert(to_write.length() == i->second); - assert(to_write.length() > 0); + ceph_assert(to_write.length() == i->second); + ceph_assert(to_write.length() > 0); std::cout << num << ": writing " << context->prefix+oid << " from " << i->first << " to " << i->first + i->second << " tid " << tid << std::endl; @@ -893,7 +893,7 @@ public: void _finish(CallbackInfo *info) override { - assert(info); + ceph_assert(info); context->state_lock.Lock(); uint64_t tid = info->id; @@ -906,14 +906,14 @@ public: } last_acked_tid = tid; - assert(!done); + ceph_assert(!done); waiting_on--; if (waiting_on == 0) { uint64_t version = 0; for (set::iterator i = waiting.begin(); i != waiting.end(); ) { - assert((*i)->is_complete()); + ceph_assert((*i)->is_complete()); if (int err = (*i)->get_return_value()) { cerr << "Error: oid " << oid << " write returned error code " << err << std::endl; @@ -929,12 +929,12 @@ public: cerr << "Error: racing read on " << oid << " returned version " << rcompletion->get_version64() << " rather than version " << version << std::endl; - assert(0 == "racing read got wrong version"); + ceph_assert(0 == "racing read got wrong version"); } { ObjectDesc old_value; - assert(context->find_object(oid, &old_value, -1)); + ceph_assert(context->find_object(oid, &old_value, -1)); if (old_value.deleted()) std::cout << num << ": left oid " << oid << " deleted" << std::endl; else @@ -1016,8 +1016,8 @@ public: ++i, ++tid) { gen_pos.seek(i->first); bufferlist to_write = gen_pos.gen_bl_advance(i->second); - assert(to_write.length() == i->second); - assert(to_write.length() > 0); + ceph_assert(to_write.length() == i->second); + ceph_assert(to_write.length() > 0); std::cout << num << ": writing " << context->prefix+oid << " from " << i->first << " to " << i->first + i->second << " tid " << tid << std::endl; @@ -1070,7 +1070,7 @@ public: void _finish(CallbackInfo *info) override { - assert(info); + ceph_assert(info); context->state_lock.Lock(); uint64_t tid = info->id; @@ -1083,14 +1083,14 @@ public: } last_acked_tid = tid; - assert(!done); + ceph_assert(!done); waiting_on--; if (waiting_on == 0) { uint64_t version = 0; for (set::iterator i = waiting.begin(); i != waiting.end(); ) { - assert((*i)->is_complete()); + ceph_assert((*i)->is_complete()); if (int err = (*i)->get_return_value()) { cerr << "Error: oid " << oid << " writesame returned error code " << err << std::endl; @@ -1106,12 +1106,12 @@ public: cerr << "Error: racing read on " << oid << " returned version " << rcompletion->get_version64() << " rather than version " << version << std::endl; - assert(0 == "racing read got wrong version"); + ceph_assert(0 == "racing read got wrong version"); } { ObjectDesc old_value; - assert(context->find_object(oid, &old_value, -1)); + ceph_assert(context->find_object(oid, &old_value, -1)); if (old_value.deleted()) std::cout << num << ": left oid " << oid << " deleted" << std::endl; else @@ -1290,7 +1290,7 @@ public: context->oid_in_use.insert(oid); context->oid_not_in_use.erase(oid); - assert(context->find_object(oid, &old_value, snap)); + ceph_assert(context->find_object(oid, &old_value, snap)); if (old_value.deleted()) std::cout << num << ": expect deleted" << std::endl; else @@ -1299,7 +1299,7 @@ public: TestWatchContext *ctx = context->get_watch_context(oid); context->state_lock.Unlock(); if (ctx) { - assert(old_value.exists); + ceph_assert(old_value.exists); TestAlarm alarm; std::cerr << num << ": about to start" << std::endl; ctx->start(); @@ -1343,7 +1343,7 @@ public: if (balance_reads) flags |= librados::OPERATION_BALANCE_READS; - assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[0], &op, + ceph_assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[0], &op, flags, NULL)); waiting_on++; @@ -1352,7 +1352,7 @@ public: for (uint32_t i = 1; i < 3; ++i) { librados::ObjectReadOperation pipeline_op; _do_read(pipeline_op, i); - assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[i], &pipeline_op, 0)); + ceph_assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[i], &pipeline_op, 0)); waiting_on++; } @@ -1365,8 +1365,8 @@ public: void _finish(CallbackInfo *info) override { Mutex::Locker l(context->state_lock); - assert(!done); - assert(waiting_on > 0); + ceph_assert(!done); + ceph_assert(waiting_on > 0); if (--waiting_on) { return; } @@ -1376,7 +1376,7 @@ public: int retval = completions[0]->get_return_value(); for (vector::iterator it = completions.begin(); it != completions.end(); ++it) { - assert((*it)->is_complete()); + ceph_assert((*it)->is_complete()); uint64_t version = (*it)->get_version64(); int err = (*it)->get_return_value(); if (err != retval) { @@ -1393,7 +1393,7 @@ public: } else if (version != old_value.version) { cerr << num << ": oid " << oid << " version is " << version << " and expected " << old_value.version << std::endl; - assert(version == old_value.version); + ceph_assert(version == old_value.version); } } if (!retval) { @@ -1404,7 +1404,7 @@ public: cerr << num << ": Error: did not find header attr, has_contents: " << old_value.has_contents() << std::endl; - assert(!old_value.has_contents()); + ceph_assert(!old_value.has_contents()); } } else { headerbl = iter->second; @@ -1412,7 +1412,7 @@ public: } if (old_value.deleted()) { std::cout << num << ": expect deleted" << std::endl; - assert(0 == "expected deleted"); + ceph_assert(0 == "expected deleted"); } else { std::cout << num << ": expect " << old_value.most_recent() << std::endl; } @@ -1465,23 +1465,23 @@ public: cerr << num << ": oid " << oid << " header does not match, old size: " << old_value.header.length() << " new size " << header.length() << std::endl; - assert(old_value.header == header); + ceph_assert(old_value.header == header); } if (omap.size() != old_value.attrs.size()) { cerr << num << ": oid " << oid << " omap.size() is " << omap.size() << " and old is " << old_value.attrs.size() << std::endl; - assert(omap.size() == old_value.attrs.size()); + ceph_assert(omap.size() == old_value.attrs.size()); } if (omap_keys.size() != old_value.attrs.size()) { cerr << num << ": oid " << oid << " omap.size() is " << omap_keys.size() << " and old is " << old_value.attrs.size() << std::endl; - assert(omap_keys.size() == old_value.attrs.size()); + ceph_assert(omap_keys.size() == old_value.attrs.size()); } } if (xattrs.size() != old_value.attrs.size()) { cerr << num << ": oid " << oid << " xattrs.size() is " << xattrs.size() << " and old is " << old_value.attrs.size() << std::endl; - assert(xattrs.size() == old_value.attrs.size()); + ceph_assert(xattrs.size() == old_value.attrs.size()); } for (map::iterator iter = old_value.attrs.begin(); iter != old_value.attrs.end(); @@ -1490,23 +1490,23 @@ public: iter->second); if (!context->no_omap) { map::iterator omap_iter = omap.find(iter->first); - assert(omap_iter != omap.end()); - assert(bl.length() == omap_iter->second.length()); + ceph_assert(omap_iter != omap.end()); + ceph_assert(bl.length() == omap_iter->second.length()); bufferlist::iterator k = bl.begin(); for(bufferlist::iterator l = omap_iter->second.begin(); !k.end() && !l.end(); ++k, ++l) { - assert(*l == *k); + ceph_assert(*l == *k); } } map::iterator xattr_iter = xattrs.find(iter->first); - assert(xattr_iter != xattrs.end()); - assert(bl.length() == xattr_iter->second.length()); + ceph_assert(xattr_iter != xattrs.end()); + ceph_assert(bl.length() == xattr_iter->second.length()); bufferlist::iterator k = bl.begin(); for (bufferlist::iterator j = xattr_iter->second.begin(); !k.end() && !j.end(); ++j, ++k) { - assert(*j == *k); + ceph_assert(*j == *k); } } if (!context->no_omap) { @@ -1514,17 +1514,17 @@ public: i != omap_requested_keys.end(); ++i) { if (!omap_returned_values.count(*i)) - assert(!old_value.attrs.count(*i)); + ceph_assert(!old_value.attrs.count(*i)); if (!old_value.attrs.count(*i)) - assert(!omap_returned_values.count(*i)); + ceph_assert(!omap_returned_values.count(*i)); } for (map::iterator i = omap_returned_values.begin(); i != omap_returned_values.end(); ++i) { - assert(omap_requested_keys.count(i->first)); - assert(omap.count(i->first)); - assert(old_value.attrs.count(i->first)); - assert(i->second == omap[i->first]); + ceph_assert(omap_requested_keys.count(i->first)); + ceph_assert(omap.count(i->first)); + ceph_assert(old_value.attrs.count(i->first)); + ceph_assert(i->second == omap[i->first]); } } } @@ -1571,10 +1571,10 @@ public: cerr << "snap_create returned " << ret << std::endl; ceph_abort(); } - assert(!context->io_ctx.snap_lookup(snapname.c_str(), &snap)); + ceph_assert(!context->io_ctx.snap_lookup(snapname.c_str(), &snap)); } else { - assert(!context->io_ctx.selfmanaged_snap_create(&snap)); + ceph_assert(!context->io_ctx.selfmanaged_snap_create(&snap)); } context->state_lock.Lock(); @@ -1628,10 +1628,10 @@ public: if (context->pool_snaps) { string snapname; - assert(!context->io_ctx.snap_get_name(snap, &snapname)); - assert(!context->io_ctx.snap_remove(snapname.c_str())); + ceph_assert(!context->io_ctx.snap_get_name(snap, &snapname)); + ceph_assert(!context->io_ctx.snap_remove(snapname.c_str())); } else { - assert(!context->io_ctx.selfmanaged_snap_remove(snap)); + ceph_assert(!context->io_ctx.selfmanaged_snap_remove(snap)); vector snapset(context->snaps.size()); int j = 0; @@ -1825,7 +1825,7 @@ public: uint64_t tid = info->id; cout << num << ": finishing rollback tid " << tid << " to " << context->prefix + oid << std::endl; - assert((int)(info->id) > last_finished); + ceph_assert((int)(info->id) > last_finished); last_finished = info->id; int r; @@ -1934,7 +1934,7 @@ public: if (info->id == 0) { // copy_from - assert(comp->is_complete()); + ceph_assert(comp->is_complete()); cout << num << ": finishing copy_from to " << context->prefix + oid << std::endl; if ((r = comp->get_return_value())) { if (r == -ENOENT && src_value.deleted()) { @@ -1945,13 +1945,13 @@ public: ceph_abort(); } } else { - assert(!version || comp->get_version64() == version); + ceph_assert(!version || comp->get_version64() == version); version = comp->get_version64(); context->update_object_version(oid, comp->get_version64()); } } else if (info->id == 1) { // racing read - assert(comp_racing_read->is_complete()); + ceph_assert(comp_racing_read->is_complete()); cout << num << ": finishing copy_from racing read to " << context->prefix + oid << std::endl; if ((r = comp_racing_read->get_return_value())) { if (!(r == -ENOENT && src_value.deleted())) { @@ -1959,8 +1959,8 @@ public: << r << std::endl; } } else { - assert(comp_racing_read->get_return_value() == 0); - assert(!version || comp_racing_read->get_version64() == version); + ceph_assert(comp_racing_read->get_return_value() == 0); + ceph_assert(!version || comp_racing_read->get_version64() == version); version = comp_racing_read->get_version64(); } } @@ -2092,7 +2092,7 @@ public: TestWatchContext *ctx = context->get_watch_context(oid); context->state_lock.Unlock(); if (ctx) { - assert(old_value.exists); + ceph_assert(old_value.exists); TestAlarm alarm; std::cerr << num << ": about to start" << std::endl; ctx->start(); @@ -2115,12 +2115,12 @@ public: if (balance_reads) flags |= librados::OPERATION_BALANCE_READS; - assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[0], &op, + ceph_assert(!context->io_ctx.aio_operate(context->prefix+oid, completions[0], &op, flags, NULL)); waiting_on++; _do_read(op, tgt_offset, length, 1); - assert(!context->io_ctx.aio_operate(context->prefix+tgt_oid, completions[1], &op, + ceph_assert(!context->io_ctx.aio_operate(context->prefix+tgt_oid, completions[1], &op, flags, NULL)); waiting_on++; @@ -2130,8 +2130,8 @@ public: void _finish(CallbackInfo *info) override { Mutex::Locker l(context->state_lock); - assert(!done); - assert(waiting_on > 0); + ceph_assert(!done); + ceph_assert(waiting_on > 0); if (--waiting_on) { return; } @@ -2143,7 +2143,7 @@ public: context->find_object(tgt_oid, &tgt_value); for (int i = 0; i < 2; i++) { - assert(completions[i]->is_complete()); + ceph_assert(completions[i]->is_complete()); int err = completions[i]->get_return_value(); if (err != retval) { cerr << num << ": Error: oid " << oid << " read returned different error codes: " @@ -2162,7 +2162,7 @@ public: if (!retval) { if (old_value.deleted()) { std::cout << num << ": expect deleted" << std::endl; - assert(0 == "expected deleted"); + ceph_assert(0 == "expected deleted"); } else { std::cout << num << ": expect " << old_value.most_recent() << std::endl; } @@ -2265,7 +2265,7 @@ public: Mutex::Locker l(context->state_lock); if (info->id == 0) { - assert(comp->is_complete()); + ceph_assert(comp->is_complete()); cout << num << ": finishing copy op to oid " << oid << std::endl; if ((r = comp->get_return_value())) { cerr << "Error: oid " << oid << " write returned error code " @@ -2351,7 +2351,7 @@ public: Mutex::Locker l(context->state_lock); if (info->id == 0) { - assert(comp->is_complete()); + ceph_assert(comp->is_complete()); cout << num << ": finishing set_chunk to oid " << oid << std::endl; if ((r = comp->get_return_value())) { if (r == -ENOENT && src_value.deleted()) { @@ -2526,7 +2526,7 @@ public: Mutex::Locker l(context->state_lock); if (info->id == 0) { - assert(comp->is_complete()); + ceph_assert(comp->is_complete()); cout << num << ": finishing set_redirect to oid " << oid << std::endl; if ((r = comp->get_return_value())) { if (r == -ENOENT && src_value.deleted()) { @@ -2657,14 +2657,14 @@ public: op.tier_promote(); int r = context->io_ctx.aio_operate(context->prefix+oid, completion, &op); - assert(!r); + ceph_assert(!r); } void _finish(CallbackInfo *info) override { context->state_lock.Lock(); - assert(!done); - assert(completion->is_complete()); + ceph_assert(!done); + ceph_assert(completion->is_complete()); ObjectDesc oid_value; context->find_object(oid, &oid_value); @@ -2673,7 +2673,7 @@ public: if (r == 0) { // sucess } else { - assert(0 == "shouldn't happen"); + ceph_assert(0 == "shouldn't happen"); } context->update_object_version(oid, completion->get_version64()); context->find_object(oid, &oid_value); @@ -2719,7 +2719,7 @@ public: comp1 = context->rados.aio_create_completion((void*) cb_arg, NULL, &write_callback); int r = context->io_ctx.hit_set_list(hash, comp1, &ls); - assert(r == 0); + ceph_assert(r == 0); } void _finish(CallbackInfo *info) override { @@ -2740,7 +2740,7 @@ public: comp2 = context->rados.aio_create_completion((void*) cb_arg, NULL, &write_callback); r = context->io_ctx.hit_set_get(hash, comp2, p->second, &bl); - assert(r == 0); + ceph_assert(r == 0); } } else { int r = comp2->get_return_value(); @@ -2753,7 +2753,7 @@ public: << std::endl; } else { // FIXME: we could verify that we did in fact race with a trim... - assert(r == -ENOENT); + ceph_assert(r == -ENOENT); } done = true; } @@ -2802,14 +2802,14 @@ public: op.undirty(); int r = context->io_ctx.aio_operate(context->prefix+oid, completion, &op, 0); - assert(!r); + ceph_assert(!r); } void _finish(CallbackInfo *info) override { context->state_lock.Lock(); - assert(!done); - assert(completion->is_complete()); + ceph_assert(!done); + ceph_assert(completion->is_complete()); context->oid_in_use.erase(oid); context->oid_not_in_use.insert(oid); context->update_object_version(oid, completion->get_version64()); @@ -2879,7 +2879,7 @@ public: op.is_dirty(&dirty, NULL); int r = context->io_ctx.aio_operate(context->prefix+oid, completion, &op, 0); - assert(!r); + ceph_assert(!r); if (snap >= 0) { context->io_ctx.snap_set_read(0); @@ -2889,22 +2889,22 @@ public: void _finish(CallbackInfo *info) override { context->state_lock.Lock(); - assert(!done); - assert(completion->is_complete()); + ceph_assert(!done); + ceph_assert(completion->is_complete()); context->oid_in_use.erase(oid); context->oid_not_in_use.insert(oid); - assert(context->find_object(oid, &old_value, snap)); + ceph_assert(context->find_object(oid, &old_value, snap)); int r = completion->get_return_value(); if (r == 0) { cout << num << ": " << (dirty ? "dirty" : "clean") << std::endl; - assert(!old_value.deleted()); - assert(dirty == old_value.dirty); + ceph_assert(!old_value.deleted()); + ceph_assert(dirty == old_value.dirty); } else { cout << num << ": got " << r << std::endl; - assert(r == -ENOENT); - assert(old_value.deleted()); + ceph_assert(r == -ENOENT); + ceph_assert(old_value.deleted()); } context->kick(); done = true; @@ -2988,7 +2988,7 @@ public: } int r = context->io_ctx.aio_operate(context->prefix+oid, completion, &op, flags, NULL); - assert(!r); + ceph_assert(!r); if (snap >= 0) { context->io_ctx.snap_set_read(0); @@ -2998,8 +2998,8 @@ public: void _finish(CallbackInfo *info) override { context->state_lock.Lock(); - assert(!done); - assert(completion->is_complete()); + ceph_assert(!done); + ceph_assert(completion->is_complete()); context->oid_flushing.erase(oid); context->oid_not_flushing.insert(oid); int r = completion->get_return_value(); @@ -3007,13 +3007,13 @@ public: if (r == 0) { context->update_object_version(oid, 0, snap); } else if (r == -EBUSY) { - assert(can_fail); + ceph_assert(can_fail); } else if (r == -EINVAL) { // caching not enabled? } else if (r == -ENOENT) { // may have raced with a remove? } else { - assert(0 == "shouldn't happen"); + ceph_assert(0 == "shouldn't happen"); } context->kick(); done = true; @@ -3075,7 +3075,7 @@ public: int r = context->io_ctx.aio_operate(context->prefix+oid, completion, &op, librados::OPERATION_IGNORE_CACHE, NULL); - assert(!r); + ceph_assert(!r); if (snap >= 0) { context->io_ctx.snap_set_read(0); @@ -3085,8 +3085,8 @@ public: void _finish(CallbackInfo *info) override { context->state_lock.Lock(); - assert(!done); - assert(completion->is_complete()); + ceph_assert(!done); + ceph_assert(completion->is_complete()); int r = completion->get_return_value(); cout << num << ": got " << cpp_strerror(r) << std::endl; @@ -3099,7 +3099,7 @@ public: } else if (r == -ENOENT) { // may have raced with a remove? } else { - assert(0 == "shouldn't happen"); + ceph_assert(0 == "shouldn't happen"); } context->kick(); done = true; diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index 0aab1ff9b5506..eb291426ffcae 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -70,7 +70,7 @@ public: pg_pool_t empty; // make an ec pool uint64_t pool_id = ++new_pool_inc.new_pool_max; - assert(pool_id == my_ec_pool); + ceph_assert(pool_id == my_ec_pool); pg_pool_t *p = new_pool_inc.get_new_pool(pool_id, &empty); p->size = 3; p->set_pg_num(64); @@ -80,7 +80,7 @@ public: new_pool_inc.new_pool_names[pool_id] = "ec"; // and a replicated pool pool_id = ++new_pool_inc.new_pool_max; - assert(pool_id == my_rep_pool); + ceph_assert(pool_id == my_rep_pool); p = new_pool_inc.get_new_pool(pool_id, &empty); p->size = 3; p->set_pg_num(64); diff --git a/src/test/osd/TestOpStat.h b/src/test/osd/TestOpStat.h index 5bf4fc9595c35..314bb66c781b6 100644 --- a/src/test/osd/TestOpStat.h +++ b/src/test/osd/TestOpStat.h @@ -27,13 +27,13 @@ public: multiset latencies; void begin(TestOp *in) { - assert(!inflight.count(in)); + ceph_assert(!inflight.count(in)); inflight[in] = gettime(); } void end(TestOp *in) { - assert(inflight.count(in)); + ceph_assert(inflight.count(in)); uint64_t curtime = gettime(); latencies.insert(curtime - inflight[in]); inflight.erase(in); diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc index 7d5581c6aabc0..6725ab0f5a9a0 100644 --- a/src/test/osd/TestPGLog.cc +++ b/src/test/osd/TestPGLog.cc @@ -311,7 +311,7 @@ public: proc_replica_log( oinfo, olog, omissing, pg_shard_t(1, shard_id_t(0))); - assert(oinfo.last_update >= log.tail); + ceph_assert(oinfo.last_update >= log.tail); if (!tcase.base.empty()) { ASSERT_EQ(tcase.base.rbegin()->version, oinfo.last_update); diff --git a/src/test/osd/TestRados.cc b/src/test/osd/TestRados.cc index d036874ed411e..3c7020e96804c 100644 --- a/src/test/osd/TestRados.cc +++ b/src/test/osd/TestRados.cc @@ -267,7 +267,7 @@ private: TestOp *gen_op(RadosTestContext &context, TestOpType type) { string oid, oid2; - assert(context.oid_not_in_use.size()); + ceph_assert(context.oid_not_in_use.size()); switch (type) { case TEST_OP_READ: diff --git a/src/test/osdc/MemWriteback.cc b/src/test/osdc/MemWriteback.cc index 0f479e3684d0f..619d510da3206 100644 --- a/src/test/osdc/MemWriteback.cc +++ b/src/test/osdc/MemWriteback.cc @@ -96,7 +96,7 @@ void MemWriteback::read(const object_t& oid, uint64_t object_no, const ZTracer::Trace &parent_trace, Context *onfinish) { - assert(snapid == CEPH_NOSNAP); + ceph_assert(snapid == CEPH_NOSNAP); C_DelayRead *wrapper = new C_DelayRead(this, m_cct, onfinish, m_lock, oid, off, len, pbl, m_delay_ns); m_finisher->queue(wrapper, len); @@ -112,7 +112,7 @@ ceph_tid_t MemWriteback::write(const object_t& oid, const ZTracer::Trace &parent_trace, Context *oncommit) { - assert(snapc.seq == 0); + ceph_assert(snapc.seq == 0); C_DelayWrite *wrapper = new C_DelayWrite(this, m_cct, oncommit, m_lock, oid, off, len, bl, m_delay_ns); m_finisher->queue(wrapper, 0); @@ -123,7 +123,7 @@ void MemWriteback::write_object_data(const object_t& oid, uint64_t off, uint64_t const bufferlist& data_bl) { dout(1) << "writing " << oid << " " << off << "~" << len << dendl; - assert(len == data_bl.length()); + ceph_assert(len == data_bl.length()); bufferlist& obj_bl = object_data[oid]; bufferlist new_obj_bl; // ensure size, or set it if new object diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc index 214d62599f6e8..cd65e10ad3732 100644 --- a/src/test/osdc/object_cacher_stress.cc +++ b/src/test/osdc/object_cacher_stress.cc @@ -47,7 +47,7 @@ public: : m_op(op), m_outstanding(outstanding) {} void finish(int r) override { m_op->done++; - assert(*m_outstanding > 0); + ceph_assert(*m_outstanding > 0); (*m_outstanding)--; } }; @@ -106,11 +106,11 @@ int stress_test(uint64_t num_ops, uint64_t num_objs, lock.Lock(); int r = obc.readx(rd, &object_set, completion); lock.Unlock(); - assert(r >= 0); + ceph_assert(r >= 0); if ((uint64_t)r == length) completion->complete(r); else - assert(r == 0); + ceph_assert(r == 0); } else { ObjectCacher::OSDWrite *wr = obc.prepare_write(snapc, bl, ceph::real_time::min(), 0, @@ -261,13 +261,13 @@ int correctness_test(uint64_t delay_ns) lock.Lock(); int r = obc.readx(back_half_rd, &object_set, &backreadcond); lock.Unlock(); - assert(r >= 0); + ceph_assert(r >= 0); if (r == 0) { std::cout << "Waiting to read data into cache" << std::endl; r = backreadcond.wait(); } - assert(r == 1<<21); + ceph_assert(r == 1<<21); /* Read the whole object in, * verify we have to wait for it to complete, @@ -285,7 +285,7 @@ int correctness_test(uint64_t delay_ns) lock.Lock(); r = obc.readx(whole_rd, &object_set, &frontreadcond); // we cleared out the cache by reading back half, it shouldn't pass immediately! - assert(r == 0); + ceph_assert(r == 0); std::cout << "Data (correctly) not available without fetching" << std::endl; ObjectCacher::OSDWrite *verify_wr = obc.prepare_write(snapc, ones_bl, @@ -309,11 +309,11 @@ int correctness_test(uint64_t delay_ns) for (int i = 1<<18; i < 1<<22; i+=1<<18) { bufferlist ones_maybe; ones_maybe.substr_of(readbl, i, ones_bl.length()); - assert(0 == memcmp(ones_maybe.c_str(), ones_bl.c_str(), ones_bl.length())); + ceph_assert(0 == memcmp(ones_maybe.c_str(), ones_bl.c_str(), ones_bl.length())); } bufferlist ones_maybe; ones_maybe.substr_of(readbl, (1<<18)+(1<<16), ones_bl.length()); - assert(0 == memcmp(ones_maybe.c_str(), ones_bl.c_str(), ones_bl.length())); + ceph_assert(0 == memcmp(ones_maybe.c_str(), ones_bl.c_str(), ones_bl.length())); std::cout << "validated that data is 0xff where it should be" << std::endl; diff --git a/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc b/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc index efd8e13a651b9..66d613caa3dd0 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_RemoveRequest.cc @@ -39,7 +39,7 @@ struct RemoveRequest { librbd::ProgressContext &progress_ctx, ContextWQ *work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); EXPECT_TRUE(image_name.empty()); EXPECT_TRUE(force); EXPECT_TRUE(remove_from_trash); @@ -73,7 +73,7 @@ struct SnapshotPurgeRequest { static SnapshotPurgeRequest *create(librados::IoCtx &io_ctx, const std::string &image_id, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->construct(image_id); s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/rbd_mirror/image_deleter/test_mock_SnapshotPurgeRequest.cc b/src/test/rbd_mirror/image_deleter/test_mock_SnapshotPurgeRequest.cc index 370b6d2942519..daff8b33e3f2d 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_SnapshotPurgeRequest.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_SnapshotPurgeRequest.cc @@ -24,7 +24,7 @@ struct MockTestImageCtx : public librbd::MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } diff --git a/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc b/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc index e96bec640a134..d82a316472ec6 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashMoveRequest.cc @@ -27,7 +27,7 @@ struct MockTestImageCtx : public librbd::MockImageCtx { const std::string &image_id, const char *snap, librados::IoCtx& p, bool read_only) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -50,7 +50,7 @@ struct Journal { std::string *mirror_uuid, ContextWQ *work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->get_tag_owner(image_id, mirror_uuid, on_finish); } @@ -70,7 +70,7 @@ struct TrashWatcher { static void notify_image_added(librados::IoCtx&, const std::string& image_id, const cls::rbd::TrashImageSpec& spec, Context *ctx) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->notify_image_added(image_id, spec, ctx); } @@ -97,7 +97,7 @@ struct ResetRequest { const std::string &client_id, const std::string &mirror_uuid, ContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -126,7 +126,7 @@ struct MoveRequest { const std::string& image_id, const cls::rbd::TrashImageSpec& trash_image_spec, Context* on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->construct(image_id, trash_image_spec); s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc index d135ede7097e8..adb47c53d800a 100644 --- a/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc +++ b/src/test/rbd_mirror/image_deleter/test_mock_TrashWatcher.cc @@ -25,7 +25,7 @@ struct MockTestImageCtx : public librbd::MockImageCtx { struct MockTrashWatcher { static MockTrashWatcher *s_instance; static MockTrashWatcher &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -49,7 +49,7 @@ struct TrashWatcher { } static TrashWatcher &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } diff --git a/src/test/rbd_mirror/image_map/test_Policy.cc b/src/test/rbd_mirror/image_map/test_Policy.cc index f2df9291ff161..ad2f983401baf 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 { - assert(false); + ceph_assert(false); } m_policy->init({}); diff --git a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc index 16ce1ad0ac143..01e9f77da2bc2 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_BootstrapRequest.cc @@ -43,7 +43,7 @@ static std::string s_image_id; template <> std::string generate_image_id(librados::IoCtx&) { - assert(!s_image_id.empty()); + ceph_assert(!s_image_id.empty()); return s_image_id; } @@ -68,13 +68,13 @@ struct ImageSync { librbd::journal::MirrorPeerClientMeta *client_meta, ContextWQ *work_queue, InstanceWatcher *instance_watcher, Context *on_finish, ProgressContext *progress_ctx) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } ImageSync() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~ImageSync() { @@ -104,7 +104,7 @@ struct CloseImageRequest { static CloseImageRequest* create(librbd::MockTestImageCtx **image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = image_ctx; s_instance->on_finish = on_finish; s_instance->construct(*image_ctx); @@ -112,7 +112,7 @@ struct CloseImageRequest { } CloseImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~CloseImageRequest() { @@ -136,14 +136,14 @@ struct CreateImageRequest { const std::string &local_image_id, librbd::MockTestImageCtx *remote_image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; s_instance->construct(local_image_id); return s_instance; } CreateImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~CreateImageRequest() { @@ -162,14 +162,14 @@ struct IsPrimaryRequest { static IsPrimaryRequest* create(librbd::MockTestImageCtx *image_ctx, bool *primary, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->primary = primary; s_instance->on_finish = on_finish; return s_instance; } IsPrimaryRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~IsPrimaryRequest() { @@ -189,7 +189,7 @@ struct OpenImageRequest { librbd::MockTestImageCtx **image_ctx, const std::string &image_id, bool read_only, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = image_ctx; s_instance->on_finish = on_finish; s_instance->construct(io_ctx, image_id); @@ -197,7 +197,7 @@ struct OpenImageRequest { } OpenImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~OpenImageRequest() { @@ -220,7 +220,7 @@ struct OpenLocalImageRequest { const std::string &local_image_id, ContextWQ *work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = local_image_ctx; s_instance->on_finish = on_finish; s_instance->construct(local_io_ctx, local_image_id); @@ -228,7 +228,7 @@ struct OpenLocalImageRequest { } OpenLocalImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~OpenLocalImageRequest() { diff --git a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc index a0715e6c35270..643ce26d5bdc2 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_CreateImageRequest.cc @@ -43,7 +43,7 @@ struct CreateRequest { bool skip_mirror_enable, MockContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); EXPECT_FALSE(non_primary_global_image_id.empty()); EXPECT_FALSE(primary_mirror_uuid.empty()); EXPECT_FALSE(skip_mirror_enable); @@ -81,7 +81,7 @@ struct CloneRequest { const std::string &primary_mirror_uuid, MockContextWQ *op_work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; s_instance->construct(); return s_instance; @@ -116,14 +116,14 @@ struct CloseImageRequest { static CloseImageRequest* create(librbd::MockTestImageCtx **image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->construct(*image_ctx); s_instance->on_finish = on_finish; return s_instance; } CloseImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~CloseImageRequest() { @@ -144,7 +144,7 @@ struct OpenImageRequest { librbd::MockTestImageCtx **image_ctx, const std::string &image_id, bool read_only, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = image_ctx; s_instance->on_finish = on_finish; s_instance->construct(io_ctx, image_id); @@ -152,7 +152,7 @@ struct OpenImageRequest { } OpenImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~OpenImageRequest() { diff --git a/src/test/rbd_mirror/image_replayer/test_mock_PrepareLocalImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_PrepareLocalImageRequest.cc index cbbc9d7e6f050..64e0697e6af4f 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_PrepareLocalImageRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_PrepareLocalImageRequest.cc @@ -38,7 +38,7 @@ struct GetMirrorImageIdRequest { const std::string& global_image_id, std::string* image_id, Context* on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_id = image_id; s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc b/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc index dba33364dcd47..782702f04836c 100644 --- a/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc +++ b/src/test/rbd_mirror/image_replayer/test_mock_PrepareRemoteImageRequest.cc @@ -60,7 +60,7 @@ struct GetMirrorImageIdRequest { const std::string& global_image_id, std::string* image_id, Context* on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_id = image_id; s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/rbd_mirror/random_write.cc b/src/test/rbd_mirror/random_write.cc index 2d89924d8ea4a..34145206da6b3 100644 --- a/src/test/rbd_mirror/random_write.cc +++ b/src/test/rbd_mirror/random_write.cc @@ -105,7 +105,7 @@ void write_image(librbd::Image &image) { uint64_t size = 0; image.size(&size); - assert(size != 0); + ceph_assert(size != 0); vector thread_offset; uint64_t i; diff --git a/src/test/rbd_mirror/test_Instances.cc b/src/test/rbd_mirror/test_Instances.cc index b9085352ff2df..72a75b2f8c388 100644 --- a/src/test/rbd_mirror/test_Instances.cc +++ b/src/test/rbd_mirror/test_Instances.cc @@ -35,7 +35,7 @@ public: void handle(const InstanceIds& instance_ids, Instance* instance) { std::unique_lock locker(lock); for (auto& instance_id : instance_ids) { - assert(instance->count > 0); + ceph_assert(instance->count > 0); --instance->count; instance->ids.insert(instance_id); diff --git a/src/test/rbd_mirror/test_mock_ImageMap.cc b/src/test/rbd_mirror/test_mock_ImageMap.cc index 50ef3c7a615a0..a82d117c93009 100644 --- a/src/test/rbd_mirror/test_mock_ImageMap.cc +++ b/src/test/rbd_mirror/test_mock_ImageMap.cc @@ -60,7 +60,7 @@ struct LoadRequest { static LoadRequest *create(librados::IoCtx &ioctx, std::map *image_map, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_map = image_map; s_instance->on_finish = on_finish; return s_instance; @@ -81,7 +81,7 @@ struct UpdateRequest { std::map &&update_mapping, std::set &&global_image_ids, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc index 3e427e98ea66c..0c60d98d4f6e8 100644 --- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc @@ -72,7 +72,7 @@ struct ImageDeleter { static void trash_move(librados::IoCtx& local_io_ctx, const std::string& global_image_id, bool resync, MockContextWQ* work_queue, Context* on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->trash_move(global_image_id, resync, on_finish); } @@ -135,7 +135,7 @@ struct PrepareLocalImageRequest { std::string *tag_owner, MockContextWQ *work_queue, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->local_image_id = local_image_id; s_instance->local_image_name = local_image_name; s_instance->tag_owner = tag_owner; @@ -171,7 +171,7 @@ struct PrepareRemoteImageRequest { cls::journal::ClientState *client_state, librbd::journal::MirrorPeerClientMeta *client_meta, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->remote_mirror_uuid = remote_mirror_uuid; s_instance->remote_image_id = remote_image_id; s_instance->remote_journaler = remote_journaler; @@ -209,7 +209,7 @@ struct BootstrapRequest { librbd::journal::MirrorPeerClientMeta *client_meta, Context *on_finish, bool *do_resync, rbd::mirror::ProgressContext *progress_ctx = nullptr) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = local_image_ctx; s_instance->on_finish = on_finish; s_instance->do_resync = do_resync; @@ -217,12 +217,12 @@ struct BootstrapRequest { } BootstrapRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~BootstrapRequest() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -248,19 +248,19 @@ struct CloseImageRequest { static CloseImageRequest* create(librbd::MockTestImageCtx **image_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ctx = image_ctx; s_instance->on_finish = on_finish; return s_instance; } CloseImageRequest() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~CloseImageRequest() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -276,7 +276,7 @@ struct EventPreprocessor { const std::string &local_mirror_uuid, librbd::journal::MirrorPeerClientMeta *client_meta, MockContextWQ *work_queue) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -284,12 +284,12 @@ struct EventPreprocessor { } EventPreprocessor() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~EventPreprocessor() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -303,7 +303,7 @@ struct ReplayStatusFormatter { static ReplayStatusFormatter* create(::journal::MockJournalerProxy *journaler, const std::string &mirror_uuid) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } @@ -311,12 +311,12 @@ struct ReplayStatusFormatter { } ReplayStatusFormatter() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~ReplayStatusFormatter() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } diff --git a/src/test/rbd_mirror/test_mock_ImageSync.cc b/src/test/rbd_mirror/test_mock_ImageSync.cc index 12c646c4e3975..339f59e86de61 100644 --- a/src/test/rbd_mirror/test_mock_ImageSync.cc +++ b/src/test/rbd_mirror/test_mock_ImageSync.cc @@ -48,7 +48,7 @@ public: bool flatten, const librbd::deep_copy::ObjectNumber &object_number, ContextWQ *work_queue, SnapSeqs *snap_seqs, ProgressContext *prog_ctx, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -98,7 +98,7 @@ public: journal::MockJournaler *journaler, librbd::journal::MirrorPeerClientMeta *client_meta, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; return s_instance; } @@ -121,7 +121,7 @@ public: journal::MockJournaler *journaler, librbd::journal::MirrorPeerClientMeta *client_meta, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->on_finish = on_finish; s_instance->sync_complete = sync_complete; return s_instance; diff --git a/src/test/rbd_mirror/test_mock_InstanceReplayer.cc b/src/test/rbd_mirror/test_mock_InstanceReplayer.cc index 68692f1f75b84..79dce7ac29674 100644 --- a/src/test/rbd_mirror/test_mock_InstanceReplayer.cc +++ b/src/test/rbd_mirror/test_mock_InstanceReplayer.cc @@ -69,18 +69,18 @@ struct ImageReplayer { InstanceWatcher *instance_watcher, RadosRef local, const std::string &local_mirror_uuid, int64_t local_pool_id, const std::string &global_image_id) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->global_image_id = global_image_id; return s_instance; } ImageReplayer() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } virtual ~ImageReplayer() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -143,7 +143,7 @@ public: EXPECT_CALL(*mock_threads.timer, add_event_after(_, _)) .WillOnce(DoAll( WithArg<1>(Invoke([this, &mock_threads, timer_ctx](Context *ctx) { - assert(mock_threads.timer_lock.is_locked()); + ceph_assert(mock_threads.timer_lock.is_locked()); if (timer_ctx != nullptr) { *timer_ctx = ctx; mock_threads.timer_cond.SignalOne(); diff --git a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc index 25862112267a1..da8d26de03195 100644 --- a/src/test/rbd_mirror/test_mock_InstanceWatcher.cc +++ b/src/test/rbd_mirror/test_mock_InstanceWatcher.cc @@ -34,17 +34,17 @@ struct ManagedLock { managed_lock::Mode mode, bool blacklist_on_break_lock, uint32_t blacklist_expire_seconds) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } ManagedLock() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~ManagedLock() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -88,17 +88,17 @@ struct ImageSyncThrottler { static ImageSyncThrottler* s_instance; static ImageSyncThrottler *create() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } ImageSyncThrottler() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } virtual ~ImageSyncThrottler() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } diff --git a/src/test/rbd_mirror/test_mock_LeaderWatcher.cc b/src/test/rbd_mirror/test_mock_LeaderWatcher.cc index c2d497fabc69b..113eeec7d7f9f 100644 --- a/src/test/rbd_mirror/test_mock_LeaderWatcher.cc +++ b/src/test/rbd_mirror/test_mock_LeaderWatcher.cc @@ -24,7 +24,7 @@ struct MockTestImageCtx : public MockImageCtx { struct MockManagedLock { static MockManagedLock *s_instance; static MockManagedLock &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -191,17 +191,17 @@ struct MirrorStatusWatcher { static MirrorStatusWatcher *create(librados::IoCtx &io_ctx, ContextWQ *work_queue) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } MirrorStatusWatcher() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~MirrorStatusWatcher() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -220,17 +220,17 @@ struct Instances { librados::IoCtx &ioctx, const std::string& instance_id, instances::Listener&) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return s_instance; } Instances() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~Instances() { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } @@ -266,12 +266,12 @@ struct MockListener : public leader_watcher::Listener { static MockListener* s_instance; MockListener() { - assert(s_instance == nullptr); + ceph_assert(s_instance == nullptr); s_instance = this; } ~MockListener() override { - assert(s_instance == this); + ceph_assert(s_instance == this); s_instance = nullptr; } diff --git a/src/test/rbd_mirror/test_mock_PoolWatcher.cc b/src/test/rbd_mirror/test_mock_PoolWatcher.cc index 07f9a4d62f8a4..43c3e622fdaf8 100644 --- a/src/test/rbd_mirror/test_mock_PoolWatcher.cc +++ b/src/test/rbd_mirror/test_mock_PoolWatcher.cc @@ -27,7 +27,7 @@ struct MockTestImageCtx : public librbd::MockImageCtx { struct MockMirroringWatcher { static MockMirroringWatcher *s_instance; static MockMirroringWatcher &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -53,7 +53,7 @@ struct MirroringWatcher { } static MirroringWatcher &get_instance() { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); return *s_instance; } @@ -114,7 +114,7 @@ struct RefreshImagesRequest { static RefreshImagesRequest *create(librados::IoCtx &io_ctx, ImageIds *image_ids, Context *on_finish) { - assert(s_instance != nullptr); + ceph_assert(s_instance != nullptr); s_instance->image_ids = image_ids; s_instance->on_finish = on_finish; return s_instance; diff --git a/src/test/rgw/test_rgw_compression.cc b/src/test/rgw/test_rgw_compression.cc index 44248d6cfa204..939789f8ea6bb 100644 --- a/src/test/rgw/test_rgw_compression.cc +++ b/src/test/rgw/test_rgw_compression.cc @@ -16,7 +16,7 @@ public: auto i = bl_buffers.begin(); while (bl_len > 0) { - assert(i != bl_buffers.end()); + ceph_assert(i != bl_buffers.end()); off_t len = std::min(bl_len, i->length()); sink.append(*i, 0, len); bl_len -= len; diff --git a/src/test/signals.cc b/src/test/signals.cc index e4b1b17123473..6e40d0a362a83 100644 --- a/src/test/signals.cc +++ b/src/test/signals.cc @@ -70,7 +70,7 @@ void testhandler(int signal) usr2 = true; break; default: - assert(0 == "unexpected signal"); + ceph_assert(0 == "unexpected signal"); } } diff --git a/src/test/system/st_rados_create_pool.cc b/src/test/system/st_rados_create_pool.cc index aeec7aef42e14..9188fafc6006c 100644 --- a/src/test/system/st_rados_create_pool.cc +++ b/src/test/system/st_rados_create_pool.cc @@ -117,15 +117,15 @@ out: std::string get_temp_pool_name(const char* prefix) { - assert(prefix); + ceph_assert(prefix); char hostname[80]; int ret = 0; ret = gethostname(hostname, sizeof(hostname)); - assert(!ret); + ceph_assert(!ret); char poolname[256]; ret = snprintf(poolname, sizeof(poolname), "%s.%s-%d", prefix, hostname, getpid()); - assert(ret > 0); - assert((unsigned int)ret < sizeof(poolname)); + ceph_assert(ret > 0); + ceph_assert((unsigned int)ret < sizeof(poolname)); return poolname; } diff --git a/src/test/test_cfuse_cache_invalidate.cc b/src/test/test_cfuse_cache_invalidate.cc index 1389e5d75f898..4e8d757285e54 100644 --- a/src/test/test_cfuse_cache_invalidate.cc +++ b/src/test/test_cfuse_cache_invalidate.cc @@ -7,7 +7,8 @@ #include #include #include -#include + +#include "include/assert.h" #define REGION 1048576 int main(int argc, char *argv[]) { @@ -27,10 +28,10 @@ int main(int argc, char *argv[]) { int i = 0; while(!done) { printf("writing %d\n", i++); - assert(pwrite(fd, buf, REGION, 0) == REGION); + ceph_assert(pwrite(fd, buf, REGION, 0) == REGION); int status; int ret = waitpid(p, &status, WNOHANG); - assert(ret >= 0); + ceph_assert(ret >= 0); if (ret > 0) { done = 1; } @@ -45,7 +46,7 @@ int main(int argc, char *argv[]) { } printf("reading\n"); - assert(pread(fd, buf, REGION, 0) == REGION); + ceph_assert(pread(fd, buf, REGION, 0) == REGION); close(fd); } diff --git a/src/test/test_denc.cc b/src/test/test_denc.cc index a46f1ff7ebf17..4e7838a9391e4 100644 --- a/src/test/test_denc.cc +++ b/src/test/test_denc.cc @@ -655,7 +655,7 @@ bufferlist Legacy::encode_n(unsigned n, const vector& segments) { auto p = bl.begin(); auto sum = std::accumulate(segments.begin(), segments.end(), 0u); - assert(sum != 0u); + ceph_assert(sum != 0u); for (auto i : segments) { buffer::ptr seg; p.copy_deep(bl.length() * i / sum, seg); diff --git a/src/test/test_rewrite_latency.cc b/src/test/test_rewrite_latency.cc index fd76e8d147bd8..348c8dde5c6af 100644 --- a/src/test/test_rewrite_latency.cc +++ b/src/test/test_rewrite_latency.cc @@ -25,7 +25,7 @@ int main(int argc, const char **argv) while (true) { utime_t now = ceph_clock_now(); int r = ::pwrite(fd, fn, strlen(fn), 0); - assert(r >= 0); + ceph_assert(r >= 0); utime_t lat = ceph_clock_now(); lat -= now; utime_t oldmin; diff --git a/src/test/test_snap_mapper.cc b/src/test/test_snap_mapper.cc index a73942d993050..60d15edf346bb 100644 --- a/src/test/test_snap_mapper.cc +++ b/src/test/test_snap_mapper.cc @@ -114,12 +114,12 @@ private: cond.Signal(); return 0; } - assert(!queue.empty()); - assert(!paused); + ceph_assert(!queue.empty()); + ceph_assert(!paused); ops.swap(queue); cond.Signal(); } - assert(!ops.empty()); + ceph_assert(!ops.empty()); for (list::iterator i = ops.begin(); i != ops.end(); @@ -464,8 +464,8 @@ public: } void choose_random_snaps(int num, set *snaps) { - assert(snaps); - assert(!snap_to_hobject.empty()); + ceph_assert(snaps); + ceph_assert(!snap_to_hobject.empty()); for (int i = 0; i < num || snaps->empty(); ++i) { snaps->insert(rand_choose(snap_to_hobject)->first); } @@ -491,7 +491,7 @@ public: i != snaps.end(); ++i) { map >::iterator j = snap_to_hobject.find(*i); - assert(j != snap_to_hobject.end()); + ceph_assert(j != snap_to_hobject.end()); j->second.insert(obj); } { @@ -513,13 +513,13 @@ public: while (mapper->get_next_objects_to_trim( snap->first, rand() % 5 + 1, &hoids) == 0) { for (auto &&hoid: hoids) { - assert(!hoid.is_max()); - assert(hobjects.count(hoid)); + ceph_assert(!hoid.is_max()); + ceph_assert(hobjects.count(hoid)); hobjects.erase(hoid); map>::iterator j = hobject_to_snap.find(hoid); - assert(j->second.count(snap->first)); + ceph_assert(j->second.count(snap->first)); set old_snaps(j->second); j->second.erase(snap->first); @@ -539,7 +539,7 @@ public: } hoids.clear(); } - assert(hobjects.empty()); + ceph_assert(hobjects.empty()); snap_to_hobject.erase(snap); } @@ -554,7 +554,7 @@ public: ++i) { map >::iterator j = snap_to_hobject.find(*i); - assert(j->second.count(obj->first)); + ceph_assert(j->second.count(obj->first)); j->second.erase(obj->first); } { @@ -575,7 +575,7 @@ public: rand_choose(hobject_to_snap); set snaps; int r = mapper->get_snaps(obj->first, &snaps); - assert(r == 0); + ceph_assert(r == 0); ASSERT_EQ(snaps, obj->second); } }; diff --git a/src/test/testcrypto.cc b/src/test/testcrypto.cc index 80f5fe36d247e..4e8a7e2c86e6b 100644 --- a/src/test/testcrypto.cc +++ b/src/test/testcrypto.cc @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) bufferlist enc_out; std::string error; if (key.encrypt(g_ceph_context, enc_in, enc_out, &error) < 0) { - assert(!error.empty()); + ceph_assert(!error.empty()); dout(0) << "couldn't encode! error " << error << dendl; exit(1); } @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) dec_in = enc_out; if (key.decrypt(g_ceph_context, dec_in, dec_out, &error) < 0) { - assert(!error.empty()); + ceph_assert(!error.empty()); dout(0) << "couldn't decode! error " << error << dendl; exit(1); } diff --git a/src/test/testmsgr.cc b/src/test/testmsgr.cc index c0ea241cd237e..85690900ef4cb 100644 --- a/src/test/testmsgr.cc +++ b/src/test/testmsgr.cc @@ -86,7 +86,7 @@ int main(int argc, const char **argv, const char *envp[]) { // start up network int whoami = mc.monmap.get_rank(args[0]); - assert(whoami >= 0); + ceph_assert(whoami >= 0); ostringstream ss; ss << mc.monmap.get_addr(whoami); std::string sss(ss.str()); diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc index b5a2aded78f27..eff8b57231c81 100644 --- a/src/test/xattr_bench.cc +++ b/src/test/xattr_bench.cc @@ -178,8 +178,8 @@ int main(int argc, char **argv) { store_dev)); std::cerr << "mkfs starting" << std::endl; - assert(!store->mkfs()); - assert(!store->mount()); + ceph_assert(!store->mkfs()); + ceph_assert(!store->mount()); std::cerr << "mounted" << std::endl; std::cerr << "attrsize\tnumattrs\ttranssize\tops\ttime" << std::endl; -- 2.39.5