From: Sage Weil <sage@redhat.com>
Date: Fri, 17 Feb 2017 19:50:38 +0000 (-0500)
Subject: osd/PGLog: reindex properly on pg log split
X-Git-Tag: v12.0.1~347^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=643ae42cf27f16dd6ed4e1402acc0483bb9fca74;p=ceph.git

osd/PGLog: reindex properly on pg log split

When pg_log_t::split_out_child() runs it builds the list, which means the
old indexes are wrong (the point to bad memory), but index() will not
rebuild them because ever since b858e869e78927dccebaa350d246bd74af7f1de9
we won't rebuild them if they are already built.

Fix that by calling unindex() before the split.

Further, the new child log also needs to be indexed.  Fix that too.

Fixes: http://tracker.ceph.com/issues/18975
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index cba1a5244593..00469e6fdb5d 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -35,8 +35,10 @@ PGLog::IndexedLog PGLog::IndexedLog::split_out_child(
   pg_t child_pgid,
   unsigned split_bits)
 {
+  unindex();
   IndexedLog ret(pg_log_t::split_out_child(child_pgid, split_bits));
   index();
+  ret.index();
   reset_rollback_info_trimmed_to_riter();
   return ret;
 }