From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 23 Jan 2017 20:43:59 +0000 (-0500)
Subject: rgw: master trims mdlogs as peers make progress on current period
X-Git-Tag: v12.0.3~20^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1afabc1fdd1c36431c216ead8da8dfd799bdbe49;p=ceph.git

rgw: master trims mdlogs as peers make progress on current period

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 28b250ee3b50..703323e233a8 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -2654,6 +2654,12 @@ int MetaMasterTrimCR::operate()
         ldout(cct, 10) << "mdlogs already purged up to realm_epoch "
             << env.last_trim_epoch << dendl;
       }
+
+      // if realm_epoch == current, trim mdlog based on markers
+      if (epoch == env.current.get_epoch()) {
+        auto mdlog = store->meta_mgr->get_log(env.current.get_period().get_id());
+        spawn(new MetaMasterTrimShardCollectCR(env, mdlog, min_status), true);
+      }
     }
     // ignore any errors during purge/trim because we want to hold the lock open
     return set_cr_done();