]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/pg: set dirty_info if we succeeding in updating log from master
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 24 Mar 2016 08:25:57 +0000 (16:25 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 24 Mar 2016 08:27:28 +0000 (16:27 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PG.cc

index 76cd700c1b3b6f39f59d17b41345303fa6896ef7..1f985361cbd3cd8ac0fb0226ced025b3411835af 100644 (file)
@@ -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();
 }