rbd-mirror: renamed 'peer_t' type to 'PeerSpec'

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/test/rbd_mirror/test_ClusterWatcher.cc b/src/test/rbd_mirror/test_ClusterWatcher.cc
index 02e4baa35757631bf4cb8356925a542ad8ab6bd4..0300bc183959bac3c285ed8c98aa9f7e5c10f953 100644 (file)
--- a/src/test/rbd_mirror/test_ClusterWatcher.cc
+++ b/src/test/rbd_mirror/test_ClusterWatcher.cc
@@ -19,7 +19,7 @@
 #include <set>
 
 using rbd::mirror::ClusterWatcher;
-using rbd::mirror::peer_t;
+using rbd::mirror::PeerSpec;
 using rbd::mirror::RadosRef;
 using std::map;
 using std::set;
@@ -59,7 +59,7 @@ public:
     TestFixture::TearDown();
   }
 
-  void create_pool(bool enable_mirroring, const peer_t &peer,
+  void create_pool(bool enable_mirroring, const PeerSpec &peer,
                    string *uuid = nullptr, string *name=nullptr) {
     string pool_name = get_temp_pool_name("test-rbd-mirror-");
     ASSERT_EQ(0, m_cluster->pool_create(pool_name.c_str()));
@@ -89,7 +89,7 @@ public:
     }
   }
 
-  void delete_pool(const string &name, const peer_t &peer) {
+  void delete_pool(const string &name, const PeerSpec &peer) {
     int64_t pool_id = m_cluster->pool_lookup(name.c_str());
     ASSERT_GE(pool_id, 0);
     if (m_pool_peers.find(pool_id) != m_pool_peers.end()) {
@@ -159,26 +159,26 @@ TEST_F(TestClusterWatcher, NoPools) {
 
 TEST_F(TestClusterWatcher, NoMirroredPools) {
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
 }
 
 TEST_F(TestClusterWatcher, ReplicatedPools) {
-  peer_t site1("", "site1", "mirror1");
-  peer_t site2("", "site2", "mirror2");
+  PeerSpec site1("", "site1", "mirror1");
+  PeerSpec site2("", "site2", "mirror2");
   string first_pool, last_pool;
   check_peers();
   create_pool(true, site1, &site1.uuid, &first_pool);
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
-  create_pool(false, peer_t());
+  create_pool(false, PeerSpec());
   check_peers();
   create_pool(true, site2, &site2.uuid);
   check_peers();
@@ -193,7 +193,7 @@ TEST_F(TestClusterWatcher, ReplicatedPools) {
 }
 
 TEST_F(TestClusterWatcher, CachePools) {
-  peer_t site1("", "site1", "mirror1");
+  PeerSpec site1("", "site1", "mirror1");
   string base1, base2, cache1, cache2;
   create_pool(true, site1, &site1.uuid, &base1);
   check_peers();
@@ -204,7 +204,7 @@ TEST_F(TestClusterWatcher, CachePools) {
   } BOOST_SCOPE_EXIT_END;
   check_peers();
 
-  create_pool(false, peer_t(), nullptr, &base2);
+  create_pool(false, PeerSpec(), nullptr, &base2);
   create_cache_pool(base2, &cache2);
   BOOST_SCOPE_EXIT( base2, cache2, this_ ) {
     this_->remove_cache_pool(base2, cache2);

diff --git a/src/test/rbd_mirror/test_PoolWatcher.cc b/src/test/rbd_mirror/test_PoolWatcher.cc
index f43d0ed0a00735fda3e7927457980b8e422b86a2..1f31f177337e65f36668551d6975f55c44b9964e 100644 (file)
--- a/src/test/rbd_mirror/test_PoolWatcher.cc
+++ b/src/test/rbd_mirror/test_PoolWatcher.cc
@@ -33,7 +33,7 @@
 using rbd::mirror::ImageId;
 using rbd::mirror::ImageIds;
 using rbd::mirror::PoolWatcher;
-using rbd::mirror::peer_t;
+using rbd::mirror::PeerSpec;
 using rbd::mirror::RadosRef;
 using std::map;
 using std::set;
@@ -88,7 +88,7 @@ public:
     }
   };
 
-  void create_pool(bool enable_mirroring, const peer_t &peer, string *name=nullptr) {
+  void create_pool(bool enable_mirroring, const PeerSpec &peer, string *name=nullptr) {
     string pool_name = get_temp_pool_name("test-rbd-mirror-");
     ASSERT_EQ(0, m_cluster->pool_create(pool_name.c_str()));
 
@@ -229,14 +229,14 @@ public:
 
 TEST_F(TestPoolWatcher, EmptyPool) {
   string uuid1 = "00000000-0000-0000-0000-000000000001";
-  peer_t site1(uuid1, "site1", "mirror1");
+  PeerSpec site1(uuid1, "site1", "mirror1");
   create_pool(true, site1);
   check_images();
 }
 
 TEST_F(TestPoolWatcher, ReplicatedPools) {
   string uuid1 = "00000000-0000-0000-0000-000000000001";
-  peer_t site1(uuid1, "site1", "mirror1");
+  PeerSpec site1(uuid1, "site1", "mirror1");
   string first_pool, local_pool, last_pool;
   create_pool(true, site1, &first_pool);
   check_images();

diff --git a/src/tools/rbd_mirror/ClusterWatcher.h b/src/tools/rbd_mirror/ClusterWatcher.h
index e0de653dd75c12bc3e2f0de2b03abb9ccd8741fc..7080a1c6a9991bd58027f1e57544fabfea2f3f5f 100644 (file)
--- a/src/tools/rbd_mirror/ClusterWatcher.h
+++ b/src/tools/rbd_mirror/ClusterWatcher.h
@@ -29,7 +29,7 @@ template <typename> class ServiceDaemon;
  */
 class ClusterWatcher {
 public:
-  typedef std::set<peer_t> Peers;
+  typedef std::set<PeerSpec> Peers;
   typedef std::map<int64_t, Peers>  PoolPeers;
   typedef std::set<std::string> PoolNames;
 

diff --git a/src/tools/rbd_mirror/Mirror.h b/src/tools/rbd_mirror/Mirror.h
index fd04cddaa512e8062cf07777fd853cc0a75575fe..153c0bc52a337f4313b79183dea393a7cfcb894b 100644 (file)
--- a/src/tools/rbd_mirror/Mirror.h
+++ b/src/tools/rbd_mirror/Mirror.h
@@ -51,7 +51,7 @@ public:
 
 private:
   typedef ClusterWatcher::PoolPeers PoolPeers;
-  typedef std::pair<int64_t, peer_t> PoolPeer;
+  typedef std::pair<int64_t, PeerSpec> PoolPeer;
 
   void update_pool_replayers(const PoolPeers &pool_peers);
 

diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index e64f87370c076bd77f317a5b7ee887936100f0f8..ffdebde4039cf932063335bb59886712c3a8fbfb 100644 (file)
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -227,7 +227,7 @@ private:
 template <typename I>
 PoolReplayer<I>::PoolReplayer(Threads<I> *threads,
                               ServiceDaemon<I>* service_daemon,
-                             int64_t local_pool_id, const peer_t &peer,
+                             int64_t local_pool_id, const PeerSpec &peer,
                              const std::vector<const char*> &args) :
   m_threads(threads),
   m_service_daemon(service_daemon),

diff --git a/src/tools/rbd_mirror/PoolReplayer.h b/src/tools/rbd_mirror/PoolReplayer.h
index 9ecb16bc30c73055c66c2a7009b89e90f97cdc23..bcd428749cb74a304eb3f394339413c1953e0b04 100644 (file)
--- a/src/tools/rbd_mirror/PoolReplayer.h
+++ b/src/tools/rbd_mirror/PoolReplayer.h
@@ -48,7 +48,7 @@ class PoolReplayer {
 public:
   PoolReplayer(Threads<ImageCtxT> *threads,
                ServiceDaemon<ImageCtxT>* service_daemon,
-              int64_t local_pool_id, const peer_t &peer,
+              int64_t local_pool_id, const PeerSpec &peer,
               const std::vector<const char*> &args);
   ~PoolReplayer();
   PoolReplayer(const PoolReplayer&) = delete;
@@ -211,7 +211,7 @@ private:
   Threads<ImageCtxT> *m_threads;
   ServiceDaemon<ImageCtxT>* m_service_daemon;
   int64_t m_local_pool_id = -1;
-  peer_t m_peer;
+  PeerSpec m_peer;
   std::vector<const char*> m_args;
 
   mutable Mutex m_lock;

diff --git a/src/tools/rbd_mirror/Types.cc b/src/tools/rbd_mirror/Types.cc
index f4abb1fae61a0b52b1afa31a5587d511d17c5cd7..74fe318ebcae51b33f442399a2ca62c001d45462 100644 (file)
--- a/src/tools/rbd_mirror/Types.cc
+++ b/src/tools/rbd_mirror/Types.cc
@@ -11,7 +11,7 @@ std::ostream &operator<<(std::ostream &os, const ImageId &image_id) {
             << "id=" << image_id.id;
 }
 
-std::ostream& operator<<(std::ostream& lhs, const peer_t &peer) {
+std::ostream& operator<<(std::ostream& lhs, const PeerSpec &peer) {
   return lhs << "uuid: " << peer.uuid
             << " cluster: " << peer.cluster_name
             << " client: " << peer.client_name;

diff --git a/src/tools/rbd_mirror/Types.h b/src/tools/rbd_mirror/Types.h
index 41920b7bb4ff836922fe4b82f9b8da2bac67fb0f..6fbd95f4ee1b86801bfd25a752b751e04ec6665d 100644 (file)
--- a/src/tools/rbd_mirror/Types.h
+++ b/src/tools/rbd_mirror/Types.h
@@ -61,34 +61,33 @@ struct Peer {
 
 typedef std::set<Peer> Peers;
 
-struct peer_t {
-  peer_t() = default;
-  peer_t(const std::string &uuid, const std::string &cluster_name,
-        const std::string &client_name)
+struct PeerSpec {
+  PeerSpec() = default;
+  PeerSpec(const std::string &uuid, const std::string &cluster_name,
+          const std::string &client_name)
     : uuid(uuid), cluster_name(cluster_name), client_name(client_name)
   {
   }
-  peer_t(const librbd::mirror_peer_t &peer) :
+  PeerSpec(const librbd::mirror_peer_t &peer) :
     uuid(peer.uuid),
     cluster_name(peer.cluster_name),
     client_name(peer.client_name)
   {
   }
+
   std::string uuid;
   std::string cluster_name;
   std::string client_name;
-  bool operator<(const peer_t &rhs) const {
-    return this->uuid < rhs.uuid;
-  }
-  bool operator()(const peer_t &lhs, const peer_t &rhs) const {
-    return lhs.uuid < rhs.uuid;
+
+  bool operator<(const PeerSpec &rhs) const {
+    return uuid < rhs.uuid;
   }
-  bool operator==(const peer_t &rhs) const {
+  bool operator==(const PeerSpec &rhs) const {
     return uuid == rhs.uuid;
   }
 };
 
-std::ostream& operator<<(std::ostream& lhs, const peer_t &peer);
+std::ostream& operator<<(std::ostream& lhs, const PeerSpec &peer);
 
 } // namespace mirror
 } // namespace rbd