From: Neha Ojha Date: Thu, 21 Mar 2019 22:12:20 +0000 (-0700) Subject: osd/PGLog.h: print olog_can_rollback_to before deciding to rollback X-Git-Tag: v12.2.13~238^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4537a491b0c6929f87a31e3eca96dccfd8fced7;p=ceph.git 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 (cherry picked from commit aa49c57f3942c676d333e1841886881af125ea01) --- diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index 6f85ee1f1a55..2c7a1c992a85 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -1000,6 +1000,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();