cleanup: rename remove_mirror_peer_uuid to mirror_group_snapshot_unlink_peer

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>

diff --git a/src/tools/rbd_mirror/group_replayer/Replayer.cc b/src/tools/rbd_mirror/group_replayer/Replayer.cc
index 12bcde58b63893e072db7b1a7b7b46cb4f5fff2f..3477feb93da60ba6e8f22d4ceacf22c5324783dd 100644 (file)
--- a/src/tools/rbd_mirror/group_replayer/Replayer.cc
+++ b/src/tools/rbd_mirror/group_replayer/Replayer.cc
@@ -1158,7 +1158,7 @@ void Replayer<I>::handle_regular_snapshot_complete(
 }
 
 template <typename I>
-void Replayer<I>::remove_mirror_peer_uuid(const std::string &snap_id) {
+void Replayer<I>::mirror_group_snapshot_unlink_peer(const std::string &snap_id) {
   auto remote_snap = std::find_if(
       m_remote_group_snaps.begin(), m_remote_group_snaps.end(),
       [snap_id](const cls::rbd::GroupSnapshot &s) {
@@ -1183,7 +1183,7 @@ void Replayer<I>::remove_mirror_peer_uuid(const std::string &snap_id) {
     rns->mirror_peer_uuids.erase(m_remote_mirror_peer_uuid);
     auto comp = create_rados_callback(
       new LambdaContext([this, snap_id](int r) {
-       handle_remove_mirror_peer_uuid(r, snap_id);
+       handle_mirror_group_snapshot_unlink_peer(r, snap_id);
       }));
 
     librados::ObjectWriteOperation op;
@@ -1196,7 +1196,7 @@ void Replayer<I>::remove_mirror_peer_uuid(const std::string &snap_id) {
 }
 
 template <typename I>
-void Replayer<I>::handle_remove_mirror_peer_uuid(
+void Replayer<I>::handle_mirror_group_snapshot_unlink_peer(
     int r, const std::string &snap_id) {
   dout(10) << snap_id << ", r=" << r << dendl;
 
@@ -1360,7 +1360,7 @@ void Replayer<I>::prune_mirror_group_snapshots(
         }
       }
     }
-    remove_mirror_peer_uuid(prune_snap->id);
+    mirror_group_snapshot_unlink_peer(prune_snap->id);
     // prune all the image snaps of the group snap locally
     if (prune_all_image_snapshots(prune_snap, locker)) {
       prune_snap = nullptr;

diff --git a/src/tools/rbd_mirror/group_replayer/Replayer.h b/src/tools/rbd_mirror/group_replayer/Replayer.h
index 11b55f88c8e6bb8d8840f9024fb52741c550fd06..bb03fcf657ce824a47c05e4af8682f811e93cebc 100644 (file)
--- a/src/tools/rbd_mirror/group_replayer/Replayer.h
+++ b/src/tools/rbd_mirror/group_replayer/Replayer.h
@@ -184,8 +184,9 @@ private:
   void handle_regular_snapshot_complete(
     int r, const std::string &group_snap_id, Context *on_finish);
 
-  void remove_mirror_peer_uuid(const std::string &snap_id);
-  void handle_remove_mirror_peer_uuid(int r, const std::string &snap_id);
+  void mirror_group_snapshot_unlink_peer(const std::string &snap_id);
+  void handle_mirror_group_snapshot_unlink_peer(
+      int r, const std::string &snap_id);
 
   bool prune_all_image_snapshots(
       cls::rbd::GroupSnapshot *local_snap,