]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PGLog::merge_log, unidex() only works from tail, we index() below anyway
authorSamuel Just <sam.just@inktank.com>
Mon, 22 Jul 2013 20:46:26 +0000 (13:46 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 22 Jul 2013 22:06:10 +0000 (15:06 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/osd/PGLog.cc

index 2f2c83757db5575960e8ac320ffdd63aa6a4b6eb..dac1f33fd91cde1e4b7e949dd43574bd3289e52f 100644 (file)
@@ -505,7 +505,6 @@ void PGLog::merge_log(ObjectStore::Transaction& t,
        break;
       dout(10) << "merge_log divergent " << oe << dendl;
       divergent.push_front(oe);
-      log.unindex(oe);
       log.log.pop_back();
     }