update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / os / seastore / async_cleaner.cc

diff --git a/ceph/src/crimson/os/seastore/async_cleaner.cc b/ceph/src/crimson/os/seastore/async_cleaner.cc
index 84677747b77cd15d39f9ba6b98abbd48a38b4e60..d7e398f5f732ad03b0e684fbaeb1e38af7423d6a 100644 (file)
--- a/ceph/src/crimson/os/seastore/async_cleaner.cc
+++ b/ceph/src/crimson/os/seastore/async_cleaner.cc
@@ -986,7 +986,7 @@ segment_id_t SegmentCleaner::allocate_segment(
   ERROR("out of space with {} {} {} {}",
         type, segment_seq_printer_t{seq}, category,
         rewrite_gen_printer_t{generation});
-  ceph_abort();
+  ceph_abort("seastore device size setting is too small");
   return NULL_SEG_ID;
 }
 
@@ -1462,6 +1462,7 @@ void SegmentCleaner::mark_space_used(
 {
   LOG_PREFIX(SegmentCleaner::mark_space_used);
   assert(background_callback->get_state() >= state_t::SCAN_SPACE);
+  assert(len);
   // TODO: drop
   if (addr.get_addr_type() != paddr_types_t::SEGMENT) {
     return;
@@ -1492,6 +1493,7 @@ void SegmentCleaner::mark_space_free(
 {
   LOG_PREFIX(SegmentCleaner::mark_space_free);
   assert(background_callback->get_state() >= state_t::SCAN_SPACE);
+  assert(len);
   // TODO: drop
   if (addr.get_addr_type() != paddr_types_t::SEGMENT) {
     return;