From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Jun 2019 15:21:16 +0000 (-0500)
Subject: mon/OSDMonitor: lookup_pruned_snap -> lookup_purged_snap
X-Git-Tag: v15.1.0~2308^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a12d80a8137a47743996d89379e63cf80d005ae3;p=ceph.git

mon/OSDMonitor: lookup_pruned_snap -> lookup_purged_snap

This confused me and sent me into the weeds.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 01b18fb884d..1bd941129d6 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6254,7 +6254,7 @@ string OSDMonitor::make_snap_purged_key_value(
   return make_snap_purged_key(pool, snap + num - 1);
 }
 
-int OSDMonitor::lookup_pruned_snap(int64_t pool, snapid_t snap,
+int OSDMonitor::lookup_purged_snap(int64_t pool, snapid_t snap,
 				   snapid_t *begin, snapid_t *end)
 {
   string k = make_snap_key(pool, snap);
@@ -6311,14 +6311,14 @@ bool OSDMonitor::try_prune_purged_snaps()
       snapid_t begin = i.get_start();
       auto end = i.get_start() + i.get_len();
       snapid_t pbegin = 0, pend = 0;
-      int r = lookup_pruned_snap(p.first, begin, &pbegin, &pend);
+      int r = lookup_purged_snap(p.first, begin, &pbegin, &pend);
       if (r == 0) {
 	// already purged.
 	// be a bit aggressive about backing off here, because the mon may
 	// do a lot of work going through this set, and if we know the
 	// purged set from the OSDs is at least *partly* stale we may as
 	// well wait for it to be fresh.
-	dout(20) << __func__ << "  we've already pruned " << pbegin
+	dout(20) << __func__ << "  we've already purged " << pbegin
 		 << "~" << (pend - pbegin) << dendl;
 	break;  // next pool
       }
@@ -12701,7 +12701,7 @@ bool OSDMonitor::_is_removed_snap(int64_t pool, snapid_t snap)
     return true;
   }
   snapid_t begin, end;
-  int r = lookup_pruned_snap(pool, snap, &begin, &end);
+  int r = lookup_purged_snap(pool, snap, &begin, &end);
   if (r == 0) {
     dout(10) << __func__ << " pool " << pool << " snap " << snap
 	     << " - purged, [" << begin << "," << end << ")" << dendl;
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 676eaba80e2..7b196bc3fd3 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -512,7 +512,7 @@ private:
   string make_snap_purged_key_value(int64_t pool, snapid_t snap, snapid_t num,
 				    epoch_t epoch, bufferlist *v);
   bool try_prune_purged_snaps();
-  int lookup_pruned_snap(int64_t pool, snapid_t snap,
+  int lookup_purged_snap(int64_t pool, snapid_t snap,
 			 snapid_t *begin, snapid_t *end);
 
   bool prepare_set_flag(MonOpRequestRef op, int flag);