From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 24 Mar 2016 08:25:57 +0000 (+0800)
Subject: osd/pg: set dirty_info if we succeeding in updating log from master
X-Git-Tag: v10.1.1~98^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e29257e43dc5f2ece008824db049889652d738fb;p=ceph.git

osd/pg: set dirty_info if we succeeding in updating log from master

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 76cd700c1b3b..1f985361cbd3 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4627,7 +4627,8 @@ void PG::merge_new_log_entries(
 void PG::update_history_from_master(pg_history_t new_history)
 {
   unreg_next_scrub();
-  info.history.merge(new_history);
+  if (info.history.merge(new_history))
+    dirty_info = true;
   reg_next_scrub();
 }