]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27015 into master
authorSage Weil <sage@redhat.com>
Thu, 6 Jun 2019 17:15:50 +0000 (12:15 -0500)
committerSage Weil <sage@redhat.com>
Thu, 6 Jun 2019 17:15:50 +0000 (12:15 -0500)
* refs/pull/27015/head:
OSD: rollforward may need to mark pglog dirty

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/PGLog.h

diff --cc src/osd/PGLog.h
index 77bbc8ba62457902d6b265db878d0d2b53f3d65c,559ba493e12d25378a6e6069e80c8c74ad915de1..47ea9248cbdecd6831c0ba6053818879b65d10e1
@@@ -570,8 -572,9 +578,9 @@@ protected
    bool pg_log_debug;
    /// Log is clean on [dirty_to, dirty_from)
    bool touched_log;
+   bool dirty_log;
    bool clear_divergent_priors;
 -  bool rebuilt_missing_with_deletes = false;
 +  bool may_include_deletes_in_missing_dirty = false;
  
    void mark_dirty_to(eversion_t to) {
      if (to > dirty_to)