crimson: fix unused variable warnings due to assert() and NDEBUG builds

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 1cb23c32e65315235522365f281aa3f6811e160a)

diff --git a/src/crimson/os/seastore/btree/fixed_kv_btree.h b/src/crimson/os/seastore/btree/fixed_kv_btree.h
index a635407dcadb8c33e4950428c2b2481a4b94fec7..bb7ae563b0c1b13e916747b627f0d8752985997c 100644 (file)
--- a/src/crimson/os/seastore/btree/fixed_kv_btree.h
+++ b/src/crimson/os/seastore/btree/fixed_kv_btree.h
@@ -1568,7 +1568,7 @@ private:
           *parent_entry.node,
           parent_entry.pos,
           *child);
-        auto &cnode = (typename internal_node_t::base_t &)*child;
+        [[maybe_unused]] auto &cnode = (typename internal_node_t::base_t &)*child;
         assert(cnode.get_node_meta().begin == node_iter.get_key());
         assert(cnode.get_node_meta().end > node_iter.get_key());
         return on_found(child->template cast<leaf_node_t>());

diff --git a/src/crimson/os/seastore/journal/circular_journal_space.h b/src/crimson/os/seastore/journal/circular_journal_space.h
index 920b5d78d30a8862cabe5a384b67b325cb66ecec..ade33d8f297cd125229c73b6380196e779affec4 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_journal_space.h
+++ b/src/crimson/os/seastore/journal/circular_journal_space.h
@@ -148,7 +148,7 @@ class CircularJournalSpace : public JournalAllocator {
     return convert_paddr_to_abs_addr(seq.offset);
   }
   void set_written_to(journal_seq_t seq) {
-    rbm_abs_addr addr = convert_paddr_to_abs_addr(seq.offset);
+    [[maybe_unused]] rbm_abs_addr addr = convert_paddr_to_abs_addr(seq.offset);
     assert(addr >= get_records_start());
     assert(addr < get_journal_end());
     written_to = seq;

diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
index b0ba9e167dcbfe134b7bd45d89a70e428bdd0e10..97ab4aeca353fbcd5d19e84115ea71527a2f7c2d 100644 (file)
--- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
+++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h
@@ -688,7 +688,7 @@ private:
        auto ait = alloc_infos.begin();
        for (; mit != mappings.end(); mit++, ait++) {
          auto mapping = static_cast<BtreeLBAMapping*>(mit->release());
-         auto &alloc_info = *ait;
+         [[maybe_unused]] auto &alloc_info = *ait;
          assert(mapping->get_key() == alloc_info.key);
          assert(mapping->get_raw_val().get_laddr() ==
            alloc_info.val.get_laddr());

diff --git a/src/crimson/os/seastore/linked_tree_node.h b/src/crimson/os/seastore/linked_tree_node.h
index 013f401cc4a5fd7d0b8a9fa4a2f09587f5068792..9ab7b750b18c2edf96c269859c007b54fb3eaeca 100644 (file)
--- a/src/crimson/os/seastore/linked_tree_node.h
+++ b/src/crimson/os/seastore/linked_tree_node.h
@@ -417,7 +417,8 @@ protected:
        iter, t.add_transactional_view<copy_dests_t>(t));
     }
     auto &copy_dests = static_cast<copy_dests_t&>(*iter);
-    auto [it, inserted] = copy_dests.dests_by_key.insert(dest);
+    [[maybe_unused]] auto [it, inserted] =
+      copy_dests.dests_by_key.insert(dest);
     assert(inserted || it->get() == dest.get());
   }
 

diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
index 746a6cdcdf572e7f89e27b6144317d5353df6380..266bde312fd03f604ee57e5a3a61569ac7d2399f 100644 (file)
--- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
+++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
@@ -293,7 +293,7 @@ OMapInnerNode::list(
              }
             }
             if (child_result.size() && last && iter == liter - 1) {
-             auto biter = --(child_result.end());
+             [[maybe_unused]] auto biter = --(child_result.end());
              if (config.last_inclusive) {
                assert(biter->first <= *last);
              } else {

diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc
index 2f5c0660cc38a69295a6cfb78e2e1d71150f2952..ee65646205ece299cf33676e36ebf0ffed3e129b 100644 (file)
--- a/src/crimson/osd/pg_map.cc
+++ b/src/crimson/osd/pg_map.cc
@@ -73,7 +73,7 @@ seastar::future<core_id_t> PGShardMapping::get_or_create_pg_mapping(
         }
         ceph_assert_always(primary_mapping.core_to_num_pgs.end() != count_iter);
         ++(count_iter->second);
-        auto [insert_iter, inserted] =
+        [[maybe_unused]] auto [insert_iter, inserted] =
           primary_mapping.pg_to_core.emplace(pgid, core_to_update);
         assert(inserted);
         DEBUG("mapping pg {} to core {} (primary): num_pgs {}",
@@ -86,7 +86,7 @@ seastar::future<core_id_t> PGShardMapping::get_or_create_pg_mapping(
         if (find_iter == other_mapping.pg_to_core.end()) {
           DEBUG("mapping pg {} to core {} (others)",
                 pgid, core_to_update);
-          auto [insert_iter, inserted] =
+          [[maybe_unused]] auto [insert_iter, inserted] =
             other_mapping.pg_to_core.emplace(pgid, core_to_update);
           assert(inserted);
         } else {

diff --git a/src/crimson/osd/pg_recovery.cc b/src/crimson/osd/pg_recovery.cc
index 09b9875a85b9c5b94cb4d3829ba5d3f95c93f495..84a8b2c235b419a767f8978943998cd5442acc79 100644 (file)
--- a/src/crimson/osd/pg_recovery.cc
+++ b/src/crimson/osd/pg_recovery.cc
@@ -409,7 +409,7 @@ PGRecovery::on_local_recover(
     [soid, &recovery_info, is_delete, &t, this] {
     if (soid.is_snap()) {
       OSDriver::OSTransaction _t(pg->get_osdriver().get_transaction(&t));
-      int r = pg->get_snap_mapper().remove_oid(soid, &_t);
+      [[maybe_unused]] int r = pg->get_snap_mapper().remove_oid(soid, &_t);
       assert(r == 0 || r == -ENOENT);
 
       if (!is_delete) {