From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 10 Sep 2018 16:09:16 +0000 (-0400)
Subject: rbd-mirror: renamed 'types' files to 'Types'
X-Git-Tag: v14.0.1~288^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c72b56be38fb9d675a2fc90f81b4f88cf165e940;p=ceph.git

rbd-mirror: renamed 'types' files to 'Types'

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 dd7117cd94cf..02e4baa35757 100644
--- a/src/test/rbd_mirror/test_ClusterWatcher.cc
+++ b/src/test/rbd_mirror/test_ClusterWatcher.cc
@@ -8,7 +8,7 @@
 #include "librbd/api/Mirror.h"
 #include "tools/rbd_mirror/ClusterWatcher.h"
 #include "tools/rbd_mirror/ServiceDaemon.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "test/rbd_mirror/test_fixture.h"
 #include "test/librados/test.h"
 #include "gtest/gtest.h"
diff --git a/src/test/rbd_mirror/test_ImageDeleter.cc b/src/test/rbd_mirror/test_ImageDeleter.cc
index ee62ced0f57d..2b3fd44cd999 100644
--- a/src/test/rbd_mirror/test_ImageDeleter.cc
+++ b/src/test/rbd_mirror/test_ImageDeleter.cc
@@ -19,7 +19,7 @@
 #include "tools/rbd_mirror/ImageDeleter.h"
 #include "tools/rbd_mirror/ServiceDaemon.h"
 #include "tools/rbd_mirror/Threads.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/ImageState.h"
 #include "librbd/Operations.h"
diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
index 8a95a65d2370..e3aa540b5fcf 100644
--- a/src/test/rbd_mirror/test_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -34,11 +34,11 @@
 #include "librbd/io/AioCompletion.h"
 #include "librbd/io/ImageRequestWQ.h"
 #include "librbd/io/ReadResult.h"
-#include "tools/rbd_mirror/types.h"
 #include "tools/rbd_mirror/ImageReplayer.h"
 #include "tools/rbd_mirror/InstanceWatcher.h"
 #include "tools/rbd_mirror/ServiceDaemon.h"
 #include "tools/rbd_mirror/Threads.h"
+#include "tools/rbd_mirror/Types.h"
 
 #include "test/librados/test.h"
 #include "gtest/gtest.h"
diff --git a/src/test/rbd_mirror/test_PoolWatcher.cc b/src/test/rbd_mirror/test_PoolWatcher.cc
index 02e96422d8c4..f43d0ed0a007 100644
--- a/src/test/rbd_mirror/test_PoolWatcher.cc
+++ b/src/test/rbd_mirror/test_PoolWatcher.cc
@@ -19,7 +19,7 @@
 #include "common/Mutex.h"
 #include "tools/rbd_mirror/PoolWatcher.h"
 #include "tools/rbd_mirror/Threads.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/pool_watcher/Types.h"
 #include "test/librados/test.h"
 #include "gtest/gtest.h"
diff --git a/src/tools/rbd_mirror/CMakeLists.txt b/src/tools/rbd_mirror/CMakeLists.txt
index b9ecdcfbbb0c..a28ad0dc1b17 100644
--- a/src/tools/rbd_mirror/CMakeLists.txt
+++ b/src/tools/rbd_mirror/CMakeLists.txt
@@ -20,7 +20,7 @@ set(rbd_mirror_internal
   PoolWatcher.cc
   ServiceDaemon.cc
   Threads.cc
-  types.cc
+  Types.cc
   image_deleter/RemoveRequest.cc
   image_deleter/SnapshotPurgeRequest.cc
   image_deleter/TrashMoveRequest.cc
diff --git a/src/tools/rbd_mirror/ClusterWatcher.h b/src/tools/rbd_mirror/ClusterWatcher.h
index 1099db4e0bcc..e0de653dd75c 100644
--- a/src/tools/rbd_mirror/ClusterWatcher.h
+++ b/src/tools/rbd_mirror/ClusterWatcher.h
@@ -12,7 +12,7 @@
 #include "common/Mutex.h"
 #include "common/Timer.h"
 #include "include/rados/librados.hpp"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/service_daemon/Types.h"
 #include <unordered_map>
 
diff --git a/src/tools/rbd_mirror/ImageDeleter.h b/src/tools/rbd_mirror/ImageDeleter.h
index 5c7285b3796f..8a17eb38c2b0 100644
--- a/src/tools/rbd_mirror/ImageDeleter.h
+++ b/src/tools/rbd_mirror/ImageDeleter.h
@@ -18,7 +18,7 @@
 #include "include/utime.h"
 #include "common/AsyncOpTracker.h"
 #include "common/Mutex.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/image_deleter/Types.h"
 #include <atomic>
 #include <deque>
diff --git a/src/tools/rbd_mirror/ImageReplayer.h b/src/tools/rbd_mirror/ImageReplayer.h
index b769d32b0c4e..8847b8e8522f 100644
--- a/src/tools/rbd_mirror/ImageReplayer.h
+++ b/src/tools/rbd_mirror/ImageReplayer.h
@@ -16,7 +16,7 @@
 #include "librbd/journal/Types.h"
 #include "librbd/journal/TypeTraits.h"
 #include "ProgressContext.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/image_replayer/Types.h"
 
 #include <boost/noncopyable.hpp>
diff --git a/src/tools/rbd_mirror/InstanceReplayer.h b/src/tools/rbd_mirror/InstanceReplayer.h
index 96969cb62c9b..0321d78c5afb 100644
--- a/src/tools/rbd_mirror/InstanceReplayer.h
+++ b/src/tools/rbd_mirror/InstanceReplayer.h
@@ -10,7 +10,7 @@
 #include "common/AsyncOpTracker.h"
 #include "common/Formatter.h"
 #include "common/Mutex.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 
 namespace librbd { class ImageCtx; }
 
diff --git a/src/tools/rbd_mirror/Mirror.h b/src/tools/rbd_mirror/Mirror.h
index 98089678118a..fd04cddaa512 100644
--- a/src/tools/rbd_mirror/Mirror.h
+++ b/src/tools/rbd_mirror/Mirror.h
@@ -9,7 +9,7 @@
 #include "include/rados/librados.hpp"
 #include "ClusterWatcher.h"
 #include "PoolReplayer.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 
 #include <set>
 #include <map>
diff --git a/src/tools/rbd_mirror/PoolReplayer.h b/src/tools/rbd_mirror/PoolReplayer.h
index e15d183725f1..9ecb16bc30c7 100644
--- a/src/tools/rbd_mirror/PoolReplayer.h
+++ b/src/tools/rbd_mirror/PoolReplayer.h
@@ -14,7 +14,7 @@
 #include "LeaderWatcher.h"
 #include "PoolWatcher.h"
 #include "ImageDeleter.h"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/image_map/Types.h"
 #include "tools/rbd_mirror/leader_watcher/Types.h"
 #include "tools/rbd_mirror/pool_watcher/Types.h"
diff --git a/src/tools/rbd_mirror/PoolWatcher.h b/src/tools/rbd_mirror/PoolWatcher.h
index d51b001700fc..c45e1bcf03f4 100644
--- a/src/tools/rbd_mirror/PoolWatcher.h
+++ b/src/tools/rbd_mirror/PoolWatcher.h
@@ -13,7 +13,7 @@
 #include "common/ceph_context.h"
 #include "common/Mutex.h"
 #include "include/rados/librados.hpp"
-#include "types.h"
+#include "tools/rbd_mirror/Types.h"
 #include <boost/functional/hash.hpp>
 #include <boost/optional.hpp>
 #include "include/assert.h"
diff --git a/src/tools/rbd_mirror/ServiceDaemon.h b/src/tools/rbd_mirror/ServiceDaemon.h
index 1f84269dc220..1de7e20bf5e4 100644
--- a/src/tools/rbd_mirror/ServiceDaemon.h
+++ b/src/tools/rbd_mirror/ServiceDaemon.h
@@ -5,7 +5,7 @@
 #define CEPH_RBD_MIRROR_SERVICE_DAEMON_H
 
 #include "common/Mutex.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include "tools/rbd_mirror/service_daemon/Types.h"
 #include <map>
 #include <string>
diff --git a/src/tools/rbd_mirror/Types.cc b/src/tools/rbd_mirror/Types.cc
new file mode 100644
index 000000000000..f4abb1fae61a
--- /dev/null
+++ b/src/tools/rbd_mirror/Types.cc
@@ -0,0 +1,21 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#include "tools/rbd_mirror/Types.h"
+
+namespace rbd {
+namespace mirror {
+
+std::ostream &operator<<(std::ostream &os, const ImageId &image_id) {
+  return os << "global id=" << image_id.global_id << ", "
+            << "id=" << image_id.id;
+}
+
+std::ostream& operator<<(std::ostream& lhs, const peer_t &peer) {
+  return lhs << "uuid: " << peer.uuid
+	     << " cluster: " << peer.cluster_name
+	     << " client: " << peer.client_name;
+}
+
+} // namespace mirror
+} // namespace rbd
diff --git a/src/tools/rbd_mirror/Types.h b/src/tools/rbd_mirror/Types.h
new file mode 100644
index 000000000000..41920b7bb4ff
--- /dev/null
+++ b/src/tools/rbd_mirror/Types.h
@@ -0,0 +1,97 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef CEPH_RBD_MIRROR_TYPES_H
+#define CEPH_RBD_MIRROR_TYPES_H
+
+#include <iostream>
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "include/rados/librados.hpp"
+#include "include/rbd/librbd.hpp"
+
+namespace rbd {
+namespace mirror {
+
+typedef std::shared_ptr<librados::Rados> RadosRef;
+typedef std::shared_ptr<librados::IoCtx> IoCtxRef;
+typedef std::shared_ptr<librbd::Image> ImageRef;
+
+struct ImageId {
+  std::string global_id;
+  std::string id;
+
+  explicit ImageId(const std::string &global_id) : global_id(global_id) {
+  }
+  ImageId(const std::string &global_id, const std::string &id)
+    : global_id(global_id), id(id) {
+  }
+
+  inline bool operator==(const ImageId &rhs) const {
+    return (global_id == rhs.global_id && id == rhs.id);
+  }
+  inline bool operator<(const ImageId &rhs) const {
+    return global_id < rhs.global_id;
+  }
+};
+
+std::ostream &operator<<(std::ostream &, const ImageId &image_id);
+
+typedef std::set<ImageId> ImageIds;
+
+struct Peer {
+  std::string peer_uuid;
+  librados::IoCtx io_ctx;
+
+  Peer() {
+  }
+  Peer(const std::string &peer_uuid) : peer_uuid(peer_uuid) {
+  }
+  Peer(const std::string &peer_uuid, librados::IoCtx& io_ctx)
+    : peer_uuid(peer_uuid), io_ctx(io_ctx) {
+  }
+
+  inline bool operator<(const Peer &rhs) const {
+    return peer_uuid < rhs.peer_uuid;
+  }
+};
+
+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)
+    : uuid(uuid), cluster_name(cluster_name), client_name(client_name)
+  {
+  }
+  peer_t(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 peer_t &rhs) const {
+    return uuid == rhs.uuid;
+  }
+};
+
+std::ostream& operator<<(std::ostream& lhs, const peer_t &peer);
+
+} // namespace mirror
+} // namespace rbd
+
+
+#endif // CEPH_RBD_MIRROR_TYPES_H
diff --git a/src/tools/rbd_mirror/image_map/Types.h b/src/tools/rbd_mirror/image_map/Types.h
index 3b6b9b4530e0..5a97430f3b63 100644
--- a/src/tools/rbd_mirror/image_map/Types.h
+++ b/src/tools/rbd_mirror/image_map/Types.h
@@ -13,7 +13,7 @@
 #include "include/buffer.h"
 #include "include/encoding.h"
 #include "include/utime.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 
 struct Context;
 
diff --git a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.h b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
index a28789b9f8fb..9c91a7ffc0e2 100644
--- a/src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
+++ b/src/tools/rbd_mirror/image_replayer/BootstrapRequest.h
@@ -11,7 +11,7 @@
 #include "librbd/journal/Types.h"
 #include "librbd/journal/TypeTraits.h"
 #include "tools/rbd_mirror/BaseRequest.h"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include <list>
 #include <string>
 
diff --git a/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.h b/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.h
index 35ed6b330148..8bfeabe29b86 100644
--- a/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.h
+++ b/src/tools/rbd_mirror/pool_watcher/RefreshImagesRequest.h
@@ -6,7 +6,7 @@
 
 #include "include/buffer.h"
 #include "include/rados/librados.hpp"
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include <string>
 
 struct Context;
diff --git a/src/tools/rbd_mirror/pool_watcher/Types.h b/src/tools/rbd_mirror/pool_watcher/Types.h
index 45fdd51b4d2a..52dfc342dd4d 100644
--- a/src/tools/rbd_mirror/pool_watcher/Types.h
+++ b/src/tools/rbd_mirror/pool_watcher/Types.h
@@ -4,7 +4,7 @@
 #ifndef CEPH_RBD_MIRROR_POOL_WATCHER_TYPES_H
 #define CEPH_RBD_MIRROR_POOL_WATCHER_TYPES_H
 
-#include "tools/rbd_mirror/types.h"
+#include "tools/rbd_mirror/Types.h"
 #include <string>
 
 namespace rbd {
diff --git a/src/tools/rbd_mirror/types.cc b/src/tools/rbd_mirror/types.cc
deleted file mode 100644
index 4cd1e490f3df..000000000000
--- a/src/tools/rbd_mirror/types.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#include "types.h"
-
-namespace rbd {
-namespace mirror {
-
-std::ostream &operator<<(std::ostream &os, const ImageId &image_id) {
-  return os << "global id=" << image_id.global_id << ", "
-            << "id=" << image_id.id;
-}
-
-std::ostream& operator<<(std::ostream& lhs, const peer_t &peer) {
-  return lhs << "uuid: " << peer.uuid
-	     << " cluster: " << peer.cluster_name
-	     << " client: " << peer.client_name;
-}
-
-} // namespace mirror
-} // namespace rbd
diff --git a/src/tools/rbd_mirror/types.h b/src/tools/rbd_mirror/types.h
deleted file mode 100644
index 41920b7bb4ff..000000000000
--- a/src/tools/rbd_mirror/types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#ifndef CEPH_RBD_MIRROR_TYPES_H
-#define CEPH_RBD_MIRROR_TYPES_H
-
-#include <iostream>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include "include/rados/librados.hpp"
-#include "include/rbd/librbd.hpp"
-
-namespace rbd {
-namespace mirror {
-
-typedef std::shared_ptr<librados::Rados> RadosRef;
-typedef std::shared_ptr<librados::IoCtx> IoCtxRef;
-typedef std::shared_ptr<librbd::Image> ImageRef;
-
-struct ImageId {
-  std::string global_id;
-  std::string id;
-
-  explicit ImageId(const std::string &global_id) : global_id(global_id) {
-  }
-  ImageId(const std::string &global_id, const std::string &id)
-    : global_id(global_id), id(id) {
-  }
-
-  inline bool operator==(const ImageId &rhs) const {
-    return (global_id == rhs.global_id && id == rhs.id);
-  }
-  inline bool operator<(const ImageId &rhs) const {
-    return global_id < rhs.global_id;
-  }
-};
-
-std::ostream &operator<<(std::ostream &, const ImageId &image_id);
-
-typedef std::set<ImageId> ImageIds;
-
-struct Peer {
-  std::string peer_uuid;
-  librados::IoCtx io_ctx;
-
-  Peer() {
-  }
-  Peer(const std::string &peer_uuid) : peer_uuid(peer_uuid) {
-  }
-  Peer(const std::string &peer_uuid, librados::IoCtx& io_ctx)
-    : peer_uuid(peer_uuid), io_ctx(io_ctx) {
-  }
-
-  inline bool operator<(const Peer &rhs) const {
-    return peer_uuid < rhs.peer_uuid;
-  }
-};
-
-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)
-    : uuid(uuid), cluster_name(cluster_name), client_name(client_name)
-  {
-  }
-  peer_t(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 peer_t &rhs) const {
-    return uuid == rhs.uuid;
-  }
-};
-
-std::ostream& operator<<(std::ostream& lhs, const peer_t &peer);
-
-} // namespace mirror
-} // namespace rbd
-
-
-#endif // CEPH_RBD_MIRROR_TYPES_H