From aa49c57f3942c676d333e1841886881af125ea01 Mon Sep 17 00:00:00 2001 From: Neha Ojha Date: Thu, 21 Mar 2019 15:12:20 -0700 Subject: [PATCH] osd/PGLog.h: print olog_can_rollback_to before deciding to rollback This is particularly important as the crt might have changed before being passed to merge_object_divergent_entries(). Fixes: http://tracker.ceph.com/issues/38894 Signed-off-by: Neha Ojha --- src/osd/PGLog.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 532128ce6ae6..1a4a5a5428e6 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -1023,6 +1023,11 @@ protected: << " attempting to rollback" << dendl; bool can_rollback = true; + // We are going to make an important decision based on the + // olog_can_rollback_to value we have received, better known it. + ldpp_dout(dpp, 10) << __func__ << ": hoid " << hoid + << " olog_can_rollback_to: " + << olog_can_rollback_to << dendl; /// Distinguish between 4) and 5) for (list::const_reverse_iterator i = entries.rbegin(); i != entries.rend(); -- 2.47.3