From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Jun 2019 19:51:01 +0000 (-0500)
Subject: mon/OSDMonitor: make_snap_epoch_key -> make_removed_snap_epoch_key
X-Git-Tag: v15.1.0~2308^2~24
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=847dc5fb78a6abe1ae0e010645e905fa833c16bb;p=ceph-ci.git

mon/OSDMonitor: make_snap_epoch_key -> make_removed_snap_epoch_key

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ce60ac187ae..d89f37e156a 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1574,7 +1574,7 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
   for (auto& i : pending_inc.new_removed_snaps) {
     {
       // all snaps removed this epoch
-      string k = make_snap_epoch_key(i.first, pending_inc.epoch);
+      string k = make_removed_snap_epoch_key(i.first, pending_inc.epoch);
       bufferlist v;
       encode(i.second, v);
       t->put(OSD_SNAP_PREFIX, k, v);
@@ -3876,7 +3876,7 @@ void OSDMonitor::get_removed_snaps_range(
   for (auto& p : osdmap.get_pools()) {
     auto& t = (*gap_removed_snaps)[p.first];
     for (epoch_t epoch = start; epoch < end; ++epoch) {
-      string k = make_snap_epoch_key(p.first, epoch);
+      string k = make_removed_snap_epoch_key(p.first, epoch);
       bufferlist v;
       mon->store->get(OSD_SNAP_PREFIX, k, v);
       if (v.length()) {
@@ -6203,7 +6203,7 @@ void OSDMonitor::clear_pool_flags(int64_t pool_id, uint64_t flags)
   pool->unset_flag(flags);
 }
 
-string OSDMonitor::make_snap_epoch_key(int64_t pool, epoch_t epoch)
+string OSDMonitor::make_removed_snap_epoch_key(int64_t pool, epoch_t epoch)
 {
   char k[80];
   snprintf(k, sizeof(k), "removed_epoch_%llu_%08lx",
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index d797be0f916..9feea941fe8 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -504,7 +504,7 @@ 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_snap_epoch_key(int64_t pool, epoch_t epoch);
+  string make_removed_snap_epoch_key(int64_t pool, 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,