From: Sage Weil <sage@redhat.com>
Date: Thu, 6 Jun 2019 17:15:50 +0000 (-0500)
Subject: Merge PR #27015 into master
X-Git-Tag: v15.1.0~2534
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=78122147dcf24cb79d262bd775c6966afc414285;p=ceph-ci.git

Merge PR #27015 into master

* refs/pull/27015/head:
	OSD: rollforward may need to mark pglog dirty

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

78122147dcf24cb79d262bd775c6966afc414285
diff --cc src/osd/PGLog.h
index 77bbc8ba624,559ba493e12..47ea9248cbd
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@@ -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)