From: Samuel Just <sjust@redhat.com>
Date: Thu, 24 Jun 2021 23:22:43 +0000 (-0700)
Subject: crimson/os/seastore/lba_manager/btree/lba_btree_node_impl: add debugging
X-Git-Tag: v17.1.0~1563^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a514cccaa9349a87fbb16da1346079c7fab6f5c;p=ceph.git

crimson/os/seastore/lba_manager/btree/lba_btree_node_impl: add debugging

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

diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc
index 9d121ec7129b..41bab2893cc6 100644
--- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc
+++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.cc
@@ -729,7 +729,15 @@ get_lba_node_ret get_lba_btree_extent(
 	  ceph_assert(meta.begin <= ret->begin()->get_key());
 	  ceph_assert(meta.end > (ret->end() - 1)->get_key());
 	}
-	assert(!(parent->has_been_invalidated() || ret->has_been_invalidated()));
+	if (parent->has_been_invalidated() || ret->has_been_invalidated()) {
+	  logger().debug(
+	    "get_lba_btree_extent: parent {} or ret {} is invalid, transaction {} is conflicted: {}",
+	    *parent,
+	    *ret,
+	    (void*)&c.trans,
+	    c.trans.is_conflicted());
+	  assert(!(parent->has_been_invalidated() || ret->has_been_invalidated()));
+	}
 	if (!ret->is_pending() && !ret->pin.is_linked()) {
 	  ret->pin.set_range(meta);
 	  c.pins.add_pin(ret->pin);
@@ -758,7 +766,15 @@ get_lba_node_ret get_lba_btree_extent(
 	  ceph_assert(meta.begin <= ret->begin()->get_key());
 	  ceph_assert(meta.end > (ret->end() - 1)->get_key());
 	}
-	assert(!(parent->has_been_invalidated() || ret->has_been_invalidated()));
+	if (parent->has_been_invalidated() || ret->has_been_invalidated()) {
+	  logger().debug(
+	    "get_lba_btree_extent: parent {} or ret {} is invalid, transaction {} is conflicted: {}",
+	    *parent,
+	    *ret,
+	    (void*)&c.trans,
+	    c.trans.is_conflicted());
+	  assert(!(parent->has_been_invalidated() || ret->has_been_invalidated()));
+	}
 	if (!ret->is_pending() && !ret->pin.is_linked()) {
 	  ret->pin.set_range(meta);
 	  c.pins.add_pin(ret->pin);