From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Sep 2019 15:50:14 +0000 (-0500)
Subject: mon/OSDMonitor: drop removed_ key generator helpers
X-Git-Tag: v15.1.0~1398^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64b2bcea82d224db77584212219939adce4bbef6;p=ceph.git

mon/OSDMonitor: drop removed_ key generator helpers

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3a8e7a02ec47..1abf3fa8b8f3 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6797,14 +6797,6 @@ void OSDMonitor::clear_pool_flags(int64_t pool_id, uint64_t flags)
   pool->unset_flag(flags);
 }
 
-string OSDMonitor::make_removed_snap_epoch_key(int64_t pool, epoch_t epoch)
-{
-  char k[80];
-  snprintf(k, sizeof(k), "removed_epoch_%llu_%08lx",
-	   (unsigned long long)pool, (unsigned long)epoch);
-  return k;
-}
-
 string OSDMonitor::make_purged_snap_epoch_key(epoch_t epoch)
 {
   char k[80];
@@ -6812,17 +6804,16 @@ string OSDMonitor::make_purged_snap_epoch_key(epoch_t epoch)
   return k;
 }
 
-string OSDMonitor::_make_snap_key(bool purged, int64_t pool, snapid_t snap)
+string OSDMonitor::make_purged_snap_key(int64_t pool, snapid_t snap)
 {
   char k[80];
-  snprintf(k, sizeof(k), "%s_snap_%llu_%016llx",
-	   purged ? "purged" : "removed",
+  snprintf(k, sizeof(k), "purged_snap_%llu_%016llx",
 	   (unsigned long long)pool, (unsigned long long)snap);
   return k;
 }
 
-string OSDMonitor::_make_snap_key_value(
-  bool purged, int64_t pool, snapid_t snap, snapid_t num,
+string OSDMonitor::make_purged_snap_key_value(
+  int64_t pool, snapid_t snap, snapid_t num,
   epoch_t epoch, bufferlist *v)
 {
   // encode the *last* epoch in the key so that we can use forward
@@ -6830,7 +6821,7 @@ string OSDMonitor::_make_snap_key_value(
   encode(snap, *v);
   encode(snap + num, *v);
   encode(epoch, *v);
-  return _make_snap_key(purged, pool, snap + num - 1);
+  return make_purged_snap_key(pool, snap + num - 1);
 }
 
 
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index f7fca26826c6..14cf446de024 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -541,27 +541,10 @@ private:
   bool _is_removed_snap(int64_t pool_id, snapid_t snapid);
   bool _is_pending_removed_snap(int64_t pool_id, snapid_t snapid);
 
-  string make_removed_snap_epoch_key(int64_t pool, epoch_t epoch);
   string make_purged_snap_epoch_key(epoch_t epoch);
-
-  string _make_snap_key(bool purged, int64_t pool, snapid_t snap);
-  string _make_snap_key_value(bool purged,
-			      int64_t pool, snapid_t snap, snapid_t num,
-			      epoch_t epoch, bufferlist *v);
-  string make_removed_snap_key(int64_t pool, snapid_t snap) {
-    return _make_snap_key(false, pool, snap);
-  }
-  string make_removed_snap_key_value(int64_t pool, snapid_t snap, snapid_t num,
-				     epoch_t epoch, bufferlist *v) {
-    return _make_snap_key_value(false, pool, snap, num, epoch, v);
-  }
-  string make_purged_snap_key(int64_t pool, snapid_t snap) {
-    return _make_snap_key(true, pool, snap);
-  }
+  string make_purged_snap_key(int64_t pool, snapid_t snap);
   string make_purged_snap_key_value(int64_t pool, snapid_t snap, snapid_t num,
-				    epoch_t epoch, bufferlist *v) {
-    return _make_snap_key_value(true, pool, snap, num, epoch, v);
-  }
+				    epoch_t epoch, bufferlist *v);
 
   bool try_prune_purged_snaps();
   int lookup_purged_snap(int64_t pool, snapid_t snap,