crimson/os/seastore: annotate all assert_all instances

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index 9105d245273c5ee0e203b1b03d73a0e2d1fbe714..73655c6d04e2f58f201646a44ce2bee61e72eb23 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -356,7 +356,9 @@ Cache::mkfs_ertr::future<> Cache::mkfs(Transaction &t)
     return mkfs_ertr::now();
   }).handle_error(
     mkfs_ertr::pass_further{},
-    crimson::ct_error::assert_all{}
+    crimson::ct_error::assert_all{
+      "Invalid error in Cache::mkfs"
+    }
   );
 }
 
@@ -404,7 +406,9 @@ Cache::replay_delta(
        delta.paddr)
     ).handle_error(
       replay_delta_ertr::pass_further{},
-      crimson::ct_error::assert_all{}
+      crimson::ct_error::assert_all{
+       "Invalid error in Cache::replay_delta"
+      }
     );
     return extent_fut.safe_then([=, &delta](auto extent) {
       if (!extent) {

diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index 8b7f56e5316f335711da2beb5d54b3fac0bd74f1..9fb4ed9fe83d86ac271224ffb2af4bd72fedb15c 100644 (file)
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -434,7 +434,9 @@ public:
          [&t, &f](auto &e) { return f(t, e); });
       }).handle_error(
        init_cached_extents_ertr::pass_further{},
-       crimson::ct_error::assert_all{}
+       crimson::ct_error::assert_all{
+         "Invalid error in Cache::init_cached_extents"
+       }
       );
   }
 

diff --git a/src/crimson/os/seastore/journal.cc b/src/crimson/os/seastore/journal.cc
index 39875fb563798a1d83504116906924595810220b..21b918e5474aff6b0fc7f2e7d2075deb224f044c 100644 (file)
--- a/src/crimson/os/seastore/journal.cc
+++ b/src/crimson/os/seastore/journal.cc
@@ -86,7 +86,9 @@ Journal::initialize_segment(Segment &segment)
       return seq;
     },
     initialize_segment_ertr::pass_further{},
-    crimson::ct_error::assert_all{ "TODO" });
+    crimson::ct_error::assert_all{
+      "Invalid error in Journal::initialize_segment"
+    });
 }
 
 ceph::bufferlist Journal::encode_record(
@@ -190,7 +192,9 @@ Journal::write_record_ret Journal::write_record(
     target);
   return current_journal_segment->write(target, to_write).handle_error(
     write_record_ertr::pass_further{},
-    crimson::ct_error::assert_all{ "TODO" }).safe_then([this, target] {
+    crimson::ct_error::assert_all{
+      "Invalid error in Journal::write_record"
+    }).safe_then([this, target] {
       committed_to = target;
       return write_record_ret(
        write_record_ertr::ready_future_marker{},
@@ -261,7 +265,9 @@ Journal::read_segment_header(segment_id_t segment)
   return segment_manager.read(paddr_t{segment, 0}, block_size
   ).handle_error(
     read_segment_header_ertr::pass_further{},
-    crimson::ct_error::assert_all{}
+    crimson::ct_error::assert_all{
+      "Invalid error in Journal::read_segment_header"
+    }
   ).safe_then([=](bufferptr bptr) -> read_segment_header_ret {
     logger().debug("segment {} bptr size {}", segment, bptr.length());
 
@@ -346,7 +352,9 @@ Journal::find_replay_segments_fut Journal::find_replay_segments()
              return find_replay_segments_ertr::now();
            }),
            find_replay_segments_ertr::pass_further{},
-           crimson::ct_error::assert_all{}
+           crimson::ct_error::assert_all{
+             "Invalid error in Journal::find_replay_segments"
+            }
          );
        }).safe_then([this, &segments]() mutable -> find_replay_segments_fut {
          logger().debug(
@@ -609,7 +617,9 @@ Journal::scan_extents_ret Journal::scan_extents(
   return read_segment_header(cursor.get_offset().segment
   ).handle_error(
     scan_extents_ertr::pass_further{},
-    crimson::ct_error::assert_all{}
+    crimson::ct_error::assert_all{
+      "Invalid error in Journal::scan_extents"
+    }
   ).safe_then([&](auto segment_header) {
     auto segment_nonce = segment_header.segment_nonce;
     return seastar::do_with(

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
index 0bef6381f180ca84f839ecee611cd28dcc4630ea..04db76926e3b6283d0a241ad486e80fc10d72bc5 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc
@@ -41,7 +41,9 @@ BtreeLBAManager::mkfs_ret BtreeLBAManager::mkfs(
     return mkfs_ertr::now();
   }).handle_error(
     mkfs_ertr::pass_further{},
-    crimson::ct_error::assert_all{}
+    crimson::ct_error::assert_all{
+      "Invalid error in BtreeLBAManager::mkfs"
+    }
   );
 }
 
@@ -380,7 +382,9 @@ BtreeLBAManager::rewrite_extent_ret BtreeLBAManager::rewrite_extent(
       }).safe_then([nlextent](auto e) {}).handle_error(
        rewrite_extent_ertr::pass_further{},
         /* ENOENT in particular should be impossible */
-       crimson::ct_error::assert_all{}
+       crimson::ct_error::assert_all{
+         "Invalid error in BtreeLBAManager::rewrite_extent after update_mapping"
+       }
       );
   } else if (is_lba_node(*extent)) {
     auto lba_extent = extent->cast<LBANode>();
@@ -414,7 +418,9 @@ BtreeLBAManager::rewrite_extent_ret BtreeLBAManager::rewrite_extent(
       nlba_extent->get_paddr()).safe_then(
        [](auto) {},
        rewrite_extent_ertr::pass_further {},
-       crimson::ct_error::assert_all{});
+       crimson::ct_error::assert_all{
+         "Invalid error in BtreeLBAManager::rewrite_extent update_internal_mapping"
+       });
   } else {
     return rewrite_extent_ertr::now();
   }

diff --git a/src/crimson/os/seastore/segment_cleaner.cc b/src/crimson/os/seastore/segment_cleaner.cc
index 9a955587c7b091224e6b03be5b589ee98bedf3d1..b2da583cc643b4934362d6986335ec490c7177c9 100644 (file)
--- a/src/crimson/os/seastore/segment_cleaner.cc
+++ b/src/crimson/os/seastore/segment_cleaner.cc
@@ -226,7 +226,9 @@ SegmentCleaner::do_immediate_work_ret SegmentCleaner::do_immediate_work(
     return do_gc(t, get_immediate_bytes_to_gc());
   }).handle_error(
     do_immediate_work_ertr::pass_further{},
-    crimson::ct_error::assert_all{}
+    crimson::ct_error::assert_all{
+      "Invalid error in SegmentCleaner::do_immediate_work"
+    }
   );
 }