librbd: s/boost::variant/std::variant/

boost::variant explicitly prevent it from being compared other types
by marking the return type of, for instance operator==(const T&) as
"void", if T is not identical to the variant type. so address this,
let's use std::variant<> instead.

more standard compliant and simpler this way.

because of https://cplusplus.github.io/LWG/issue3052, libstdc++
only specializes for std::variant<> for std::visit(), while libc++
allows the derived types of std::variant<> to be "visited", hence
we add an adaptor for SnapshotNamespace.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index 6c22256fd0d9774e0c82d277b56dcdb9b454010e..9f38c043a2577823e793cfe124a31dc28a9ff1f4 100644 (file)
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -2326,8 +2326,8 @@ int snapshot_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
     return -EINVAL;
   }
 
-  if (boost::get<cls::rbd::UnknownSnapshotNamespace>(
-        &snap_meta.snapshot_namespace) != nullptr) {
+  if (std::holds_alternative<cls::rbd::UnknownSnapshotNamespace>(
+        snap_meta.snapshot_namespace)) {
     CLS_ERR("Unknown snapshot namespace provided");
     return -EINVAL;
   }
@@ -5708,7 +5708,7 @@ int image_snapshot_unlink_peer(cls_method_context_t hctx,
     return r;
   }
 
-  auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   if (mirror_ns == nullptr) {
     CLS_LOG(5, "mirror_image_snapshot_unlink_peer " \
@@ -5726,8 +5726,8 @@ int image_snapshot_unlink_peer(cls_method_context_t hctx,
     // should remove the snapshot instead.
     auto search_lambda = [snap_id](const cls_rbd_snap& snap_meta) {
       if (snap_meta.id > snap_id &&
-          boost::get<cls::rbd::MirrorSnapshotNamespace>(
-                   &snap_meta.snapshot_namespace) != nullptr) {
+          std::holds_alternative<cls::rbd::MirrorSnapshotNamespace>(
+                   snap_meta.snapshot_namespace)) {
         return -EEXIST;
       }
       return 0;
@@ -5763,7 +5763,7 @@ int image_snapshot_set_copy_progress(cls_method_context_t hctx,
     return r;
   }
 
-  auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   if (mirror_ns == nullptr) {
     CLS_LOG(5, "mirror_image_snapshot_set_copy_progress " \

diff --git a/src/cls/rbd/cls_rbd_types.cc b/src/cls/rbd/cls_rbd_types.cc
index ce424f7c36a1eb296a3b17d9faace3f0e1761b4a..b3fc67cf0811ba320d34e386318f38b2196981a8 100644 (file)
--- a/src/cls/rbd/cls_rbd_types.cc
+++ b/src/cls/rbd/cls_rbd_types.cc
@@ -784,7 +784,7 @@ void MirrorSnapshotNamespace::dump(Formatter *f) const {
   }
 }
 
-class EncodeSnapshotNamespaceVisitor : public boost::static_visitor<void> {
+class EncodeSnapshotNamespaceVisitor {
 public:
   explicit EncodeSnapshotNamespaceVisitor(bufferlist &bl) : m_bl(bl) {
   }
@@ -800,7 +800,7 @@ private:
   bufferlist &m_bl;
 };
 
-class DecodeSnapshotNamespaceVisitor : public boost::static_visitor<void> {
+class DecodeSnapshotNamespaceVisitor {
 public:
   DecodeSnapshotNamespaceVisitor(bufferlist::const_iterator &iter)
     : m_iter(iter) {
@@ -814,7 +814,7 @@ private:
   bufferlist::const_iterator &m_iter;
 };
 
-class DumpSnapshotNamespaceVisitor : public boost::static_visitor<void> {
+class DumpSnapshotNamespaceVisitor {
 public:
   explicit DumpSnapshotNamespaceVisitor(Formatter *formatter, const std::string &key)
     : m_formatter(formatter), m_key(key) {}
@@ -830,7 +830,7 @@ private:
   std::string m_key;
 };
 
-class GetTypeVisitor : public boost::static_visitor<SnapshotNamespaceType> {
+class GetTypeVisitor {
 public:
   template <typename T>
   inline SnapshotNamespaceType operator()(const T&) const {
@@ -840,8 +840,8 @@ public:
 
 SnapshotNamespaceType get_snap_namespace_type(
     const SnapshotNamespace& snapshot_namespace) {
-  return static_cast<SnapshotNamespaceType>(boost::apply_visitor(
-    GetTypeVisitor(), snapshot_namespace));
+  return static_cast<SnapshotNamespaceType>(snapshot_namespace.visit(
+    GetTypeVisitor()));
 }
 
 void SnapshotInfo::encode(bufferlist& bl) const {
@@ -869,8 +869,7 @@ void SnapshotInfo::decode(bufferlist::const_iterator& it) {
 void SnapshotInfo::dump(Formatter *f) const {
   f->dump_unsigned("id", id);
   f->open_object_section("namespace");
-  boost::apply_visitor(DumpSnapshotNamespaceVisitor(f, "type"),
-                       snapshot_namespace);
+  snapshot_namespace.visit(DumpSnapshotNamespaceVisitor(f, "type"));
   f->close_section();
   f->dump_string("name", name);
   f->dump_unsigned("image_size", image_size);
@@ -899,7 +898,7 @@ void SnapshotInfo::generate_test_instances(std::list<SnapshotInfo*> &o) {
 
 void SnapshotNamespace::encode(bufferlist& bl) const {
   ENCODE_START(1, 1, bl);
-  boost::apply_visitor(EncodeSnapshotNamespaceVisitor(bl), *this);
+  visit(EncodeSnapshotNamespaceVisitor(bl));
   ENCODE_FINISH(bl);
 }
 
@@ -925,13 +924,12 @@ void SnapshotNamespace::decode(bufferlist::const_iterator &p)
       *this = UnknownSnapshotNamespace();
       break;
   }
-  boost::apply_visitor(DecodeSnapshotNamespaceVisitor(p), *this);
+  visit(DecodeSnapshotNamespaceVisitor(p));
   DECODE_FINISH(p);
 }
 
 void SnapshotNamespace::dump(Formatter *f) const {
-  boost::apply_visitor(
-    DumpSnapshotNamespaceVisitor(f, "snapshot_namespace_type"), *this);
+  visit(DumpSnapshotNamespaceVisitor(f, "snapshot_namespace_type"));
 }
 
 void SnapshotNamespace::generate_test_instances(std::list<SnapshotNamespace*> &o) {
@@ -955,6 +953,12 @@ void SnapshotNamespace::generate_test_instances(std::list<SnapshotNamespace*> &o
                                                             "uuid", 123)));
 }
 
+std::ostream& operator<<(std::ostream& os, const SnapshotNamespace& ns) {
+  return ns.visit([&os](const auto& val) -> std::ostream& {
+    return os << val;
+  });
+}
+
 std::ostream& operator<<(std::ostream& os, const SnapshotNamespaceType& type) {
   switch (type) {
   case SNAPSHOT_NAMESPACE_TYPE_USER:

diff --git a/src/cls/rbd/cls_rbd_types.h b/src/cls/rbd/cls_rbd_types.h
index e84e691287cf1e53a2ec90086a0f27b39b27959f..c8d2cb871e4439f2fcae584e36803ca6d721024f 100644 (file)
--- a/src/cls/rbd/cls_rbd_types.h
+++ b/src/cls/rbd/cls_rbd_types.h
@@ -4,7 +4,6 @@
 #ifndef CEPH_CLS_RBD_TYPES_H
 #define CEPH_CLS_RBD_TYPES_H
 
-#include <boost/variant.hpp>
 #include "include/int_types.h"
 #include "include/buffer.h"
 #include "include/encoding.h"
@@ -14,6 +13,7 @@
 #include <iosfwd>
 #include <string>
 #include <set>
+#include <variant>
 
 #define RBD_GROUP_REF "rbd_group_ref"
 
@@ -442,6 +442,10 @@ struct UserSnapshotNamespace {
     return true;
   }
 
+  inline bool operator!=(const UserSnapshotNamespace& usn) const {
+    return false;
+  }
+
   inline bool operator<(const UserSnapshotNamespace& usn) const {
     return false;
   }
@@ -474,6 +478,10 @@ struct GroupSnapshotNamespace {
           group_snapshot_id == gsn.group_snapshot_id;
   }
 
+  inline bool operator!=(const GroupSnapshotNamespace& gsn) const {
+    return !operator==(gsn);
+  }
+
   inline bool operator<(const GroupSnapshotNamespace& gsn) const {
     if (group_pool != gsn.group_pool) {
       return group_pool < gsn.group_pool;
@@ -506,6 +514,9 @@ struct TrashSnapshotNamespace {
   inline bool operator==(const TrashSnapshotNamespace& usn) const {
     return true;
   }
+  inline bool operator!=(const TrashSnapshotNamespace& usn) const {
+    return false;
+  }
   inline bool operator<(const TrashSnapshotNamespace& usn) const {
     return false;
   }
@@ -611,6 +622,10 @@ struct MirrorSnapshotNamespace {
            snap_seqs == rhs.snap_seqs;
   }
 
+  inline bool operator!=(const MirrorSnapshotNamespace& rhs) const {
+    return !operator==(rhs);
+  }
+
   inline bool operator<(const MirrorSnapshotNamespace& rhs) const {
     if (state != rhs.state) {
       return state < rhs.state;
@@ -644,6 +659,10 @@ struct UnknownSnapshotNamespace {
     return true;
   }
 
+  inline bool operator!=(const UnknownSnapshotNamespace& gsn) const {
+    return false;
+  }
+
   inline bool operator<(const UnknownSnapshotNamespace& gsn) const {
     return false;
   }
@@ -656,11 +675,11 @@ std::ostream& operator<<(std::ostream& os, const TrashSnapshotNamespace& ns);
 std::ostream& operator<<(std::ostream& os, const MirrorSnapshotNamespace& ns);
 std::ostream& operator<<(std::ostream& os, const UnknownSnapshotNamespace& ns);
 
-typedef boost::variant<UserSnapshotNamespace,
-                       GroupSnapshotNamespace,
-                       TrashSnapshotNamespace,
-                       MirrorSnapshotNamespace,
-                       UnknownSnapshotNamespace> SnapshotNamespaceVariant;
+typedef std::variant<UserSnapshotNamespace,
+                    GroupSnapshotNamespace,
+                    TrashSnapshotNamespace,
+                    MirrorSnapshotNamespace,
+                    UnknownSnapshotNamespace> SnapshotNamespaceVariant;
 
 struct SnapshotNamespace : public SnapshotNamespaceVariant {
   using SnapshotNamespaceVariant::SnapshotNamespaceVariant;
@@ -669,20 +688,20 @@ struct SnapshotNamespace : public SnapshotNamespaceVariant {
   void decode(ceph::buffer::list::const_iterator& it);
   void dump(ceph::Formatter *f) const;
 
-  static void generate_test_instances(std::list<SnapshotNamespace*> &o);
-
-  inline bool operator==(const SnapshotNamespaceVariant& sn) const {
-    return static_cast<const SnapshotNamespaceVariant&>(*this) == sn;
+  template <typename F>
+  decltype(auto) visit(F&& f) const & {
+    return std::visit(std::forward<F>(f), static_cast<const SnapshotNamespaceVariant&>(*this));
   }
-  inline bool operator<(const SnapshotNamespaceVariant& sn) const {
-    return static_cast<const SnapshotNamespaceVariant&>(*this) < sn;
-  }
-  inline bool operator!=(const SnapshotNamespaceVariant& sn) const {
-    return !(*this == sn);
+  template <typename F>
+  decltype(auto) visit(F&& f) & {
+    return std::visit(std::forward<F>(f), static_cast<SnapshotNamespaceVariant&>(*this));
   }
+  static void generate_test_instances(std::list<SnapshotNamespace*> &o);
 };
 WRITE_CLASS_ENCODER(SnapshotNamespace);
 
+std::ostream& operator<<(std::ostream& os, const SnapshotNamespace& ns);
+
 SnapshotNamespaceType get_snap_namespace_type(
     const SnapshotNamespace& snapshot_namespace);
 
@@ -866,6 +885,7 @@ struct TrashImageSpec {
             deferment_end_time == rhs.deferment_end_time);
   }
 };
+
 WRITE_CLASS_ENCODER(TrashImageSpec);
 
 struct MirrorImageMap {

diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h
index 729b962be4f2cc08377554f8e9cff4cb07354041..d8887f9af8d16b50c9310ae86bfe44084b5a93fe 100644 (file)
--- a/src/librbd/ImageCtx.h
+++ b/src/librbd/ImageCtx.h
@@ -75,8 +75,8 @@ namespace librbd {
     struct SnapKeyComparator {
       inline bool operator()(const SnapKey& lhs, const SnapKey& rhs) const {
         // only compare by namespace type and name
-        if (lhs.first.which() != rhs.first.which()) {
-          return lhs.first.which() < rhs.first.which();
+        if (lhs.first.index() != rhs.first.index()) {
+          return lhs.first.index() < rhs.first.index();
         }
         return lhs.second < rhs.second;
       }

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
index f4fdc54b90d116196bbd20932c7aba21dc712abc..f8e47a8dfd3eb90f2980b36a263282dc13ad91ae 100644 (file)
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@ -1150,7 +1150,7 @@ bool ImageWatcher<I>::handle_payload(const SnapCreatePayload &payload,
   auto request_type = exclusive_lock::OPERATION_REQUEST_TYPE_GENERAL;
 
   // rbd-mirror needs to accept forced promotion orphan snap create requests
-  auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &payload.snap_namespace);
   if (mirror_ns != nullptr && mirror_ns->is_orphan()) {
     request_type = exclusive_lock::OPERATION_REQUEST_TYPE_FORCE_PROMOTION;

diff --git a/src/librbd/api/Group.cc b/src/librbd/api/Group.cc
index cb6b44e8d5a0d1f1c7765fac7c60c60bc22322e8..e5f3da69cb4c0ce6166166250789cc940ad84118 100644 (file)
--- a/src/librbd/api/Group.cc
+++ b/src/librbd/api/Group.cc
@@ -45,8 +45,8 @@ snap_t get_group_snap_id(I* ictx,
   for (; it != ictx->snap_ids.end(); ++it) {
     if (it->first.first == in_snap_namespace) {
       return it->second;
-    } else if (boost::get<cls::rbd::GroupSnapshotNamespace>(&it->first.first) ==
-                 nullptr) {
+    } else if (!std::holds_alternative<cls::rbd::GroupSnapshotNamespace>(
+                it->first.first)) {
       break;
     }
   }

diff --git a/src/librbd/api/Mirror.cc b/src/librbd/api/Mirror.cc
index 51716ff3698799290c685577f505c7877ec18efe..3ae98ea73b24e9953c61593d3af1de1626b6a91e 100644 (file)
--- a/src/librbd/api/Mirror.cc
+++ b/src/librbd/api/Mirror.cc
@@ -1610,7 +1610,7 @@ int Mirror<I>::peer_site_remove(librados::IoCtx& io_ctx,
       {
         std::shared_lock image_locker{img_ctx->image_lock};
         for (auto &it : img_ctx->snap_info) {
-          auto info = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+          auto info = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
             &it.second.snap_namespace);
           if (info && info->mirror_peer_uuids.count(uuid)) {
             snap_ids.push_back(it.first);

diff --git a/src/librbd/api/Snapshot.cc b/src/librbd/api/Snapshot.cc
index c175808bdc24049b4d4836d4a18b704e7b648bcf..03cefbd1c0a0588db61176957a4b9171662d0567 100644 (file)
--- a/src/librbd/api/Snapshot.cc
+++ b/src/librbd/api/Snapshot.cc
@@ -26,7 +26,7 @@ namespace api {
 
 namespace {
 
-class GetGroupVisitor : public boost::static_visitor<int> {
+class GetGroupVisitor {
 public:
   CephContext* cct;
   librados::IoCtx *image_ioctx;
@@ -80,7 +80,7 @@ public:
   }
 };
 
-class GetTrashVisitor : public boost::static_visitor<int> {
+class GetTrashVisitor {
 public:
   std::string* original_name;
 
@@ -100,7 +100,7 @@ public:
   }
 };
 
-class GetMirrorVisitor : public boost::static_visitor<int> {
+class GetMirrorVisitor {
 public:
   snap_mirror_namespace_t *mirror_snap;
 
@@ -143,7 +143,7 @@ int Snapshot<I>::get_group_namespace(I *ictx, uint64_t snap_id,
   }
 
   GetGroupVisitor ggv = GetGroupVisitor(ictx->cct, &ictx->md_ctx, group_snap);
-  r = boost::apply_visitor(ggv, snap_info->snap_namespace);
+  r = snap_info->snap_namespace.visit(ggv);
   if (r < 0) {
     return r;
   }
@@ -166,7 +166,7 @@ int Snapshot<I>::get_trash_namespace(I *ictx, uint64_t snap_id,
   }
 
   auto visitor = GetTrashVisitor(original_name);
-  r = boost::apply_visitor(visitor, snap_info->snap_namespace);
+  r = snap_info->snap_namespace.visit(visitor);
   if (r < 0) {
     return r;
   }
@@ -189,7 +189,7 @@ int Snapshot<I>::get_mirror_namespace(
   }
 
   auto gmv = GetMirrorVisitor(mirror_snap);
-  r = boost::apply_visitor(gmv, snap_info->snap_namespace);
+  r = snap_info->snap_namespace.visit(gmv);
   if (r < 0) {
     return r;
   }

diff --git a/src/librbd/deep_copy/SnapshotCopyRequest.cc b/src/librbd/deep_copy/SnapshotCopyRequest.cc
index 9ff02644de965c38df0a130507bba979c9b295f5..1aadd34db36c2e87079037e182ffc653219ef12c 100644 (file)
--- a/src/librbd/deep_copy/SnapshotCopyRequest.cc
+++ b/src/librbd/deep_copy/SnapshotCopyRequest.cc
@@ -257,8 +257,7 @@ void SnapshotCopyRequest<I>::send_snap_remove() {
       return;
     }
 
-    if (boost::get<cls::rbd::UserSnapshotNamespace>(&snap_namespace) ==
-          nullptr) {
+    if (!std::holds_alternative<cls::rbd::UserSnapshotNamespace>(snap_namespace)) {
       continue;
     }
 
@@ -347,8 +346,7 @@ void SnapshotCopyRequest<I>::send_snap_create() {
 
     if (m_snap_seqs.find(src_snap_id) == m_snap_seqs.end()) {
       // the source snapshot is not in our mapping table, ...
-      if (boost::get<cls::rbd::UserSnapshotNamespace>(&snap_namespace) !=
-            nullptr) {
+      if (std::holds_alternative<cls::rbd::UserSnapshotNamespace>(snap_namespace)) {
         // ... create it since it's a user snapshot
         break;
       } else if (src_snap_id == m_src_snap_id_end) {

diff --git a/src/librbd/mirror/GetInfoRequest.cc b/src/librbd/mirror/GetInfoRequest.cc
index a7ee645670413f785b2d6dd2e9039bd1fdff4976..2db8aaa84c59b3931c8cdbb95a32376affda17bc 100644 (file)
--- a/src/librbd/mirror/GetInfoRequest.cc
+++ b/src/librbd/mirror/GetInfoRequest.cc
@@ -259,7 +259,7 @@ void GetInfoRequest<I>::calc_promotion_state(
   *m_primary_mirror_uuid = "";
 
   for (auto it = snap_info.rbegin(); it != snap_info.rend(); it++) {
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &it->second.snap_namespace);
 
     if (mirror_ns != nullptr) {

diff --git a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
index 13f7894156ed16cc91513668cad470a9c0b384c9..9f8317ed936e2157215acca6f225e7dded3cb752 100644 (file)
--- a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
+++ b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
@@ -194,7 +194,7 @@ void CreatePrimaryRequest<I>::unlink_peer() {
     size_t count = 0;
     uint64_t unlink_snap_id = 0;
     for (auto &snap_it : m_image_ctx->snap_info) {
-      auto info = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+      auto info = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
         &snap_it.second.snap_namespace);
       if (info == nullptr) {
         continue;

diff --git a/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc b/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
index 6e1884249360690f5a6e8f7696471eed14eeaaff..b28591c00e8bfed5387990aa3765ead510c4d64a 100644 (file)
--- a/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
+++ b/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
@@ -68,10 +68,10 @@ void UnlinkPeerRequest<I>::unlink_peer() {
        snap_it != m_image_ctx->snap_info.end(); ++snap_it) {
     if (snap_it->first == m_snap_id) {
       r = 0;
-      mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+      mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
         &snap_it->second.snap_namespace);
-    } else if (boost::get<cls::rbd::MirrorSnapshotNamespace>(
-                 &snap_it->second.snap_namespace) != nullptr) {
+    } else if (std::holds_alternative<cls::rbd::MirrorSnapshotNamespace>(
+                 snap_it->second.snap_namespace)) {
       ldout(cct, 15) << "located newer mirror snapshot" << dendl;
       m_newer_mirror_snapshots = true;
       break;
@@ -186,7 +186,7 @@ void UnlinkPeerRequest<I>::remove_snapshot() {
     return;
   }
 
-  auto info = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto info = std::get<cls::rbd::MirrorSnapshotNamespace>(
     snap_namespace);
 
   info.mirror_peer_uuids.erase(m_mirror_peer_uuid);

diff --git a/src/librbd/mirror/snapshot/Utils.cc b/src/librbd/mirror/snapshot/Utils.cc
index ecf884b54c41cd7a6080ffacfac0cc15b481231a..36d1558be4302a743810c544a3dd2e85d85b7586 100644 (file)
--- a/src/librbd/mirror/snapshot/Utils.cc
+++ b/src/librbd/mirror/snapshot/Utils.cc
@@ -28,12 +28,12 @@ bool get_rollback_snap_id(
     uint64_t *rollback_snap_id) {
 
   for (; it != end; it++) {
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
-      &it->second.snap_namespace);
-    if (mirror_ns->state != cls::rbd::MIRROR_SNAPSHOT_STATE_NON_PRIMARY) {
+    auto mirror_ns = std::get<cls::rbd::MirrorSnapshotNamespace>(
+      it->second.snap_namespace);
+    if (mirror_ns.state != cls::rbd::MIRROR_SNAPSHOT_STATE_NON_PRIMARY) {
       break;
     }
-    if (mirror_ns->complete) {
+    if (mirror_ns.complete) {
       break;
     }
   }
@@ -69,7 +69,7 @@ bool can_create_primary_snapshot(I *image_ctx, bool demoted, bool force,
 
   for (auto it = image_ctx->snap_info.rbegin();
        it != image_ctx->snap_info.rend(); it++) {
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &it->second.snap_namespace);
     if (mirror_ns == nullptr) {
       continue;
@@ -133,7 +133,7 @@ bool can_create_non_primary_snapshot(I *image_ctx) {
 
   for (auto it = image_ctx->snap_info.rbegin();
        it != image_ctx->snap_info.rend(); it++) {
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &it->second.snap_namespace);
     if (mirror_ns != nullptr) {
       ldout(cct, 20) << "previous mirror snapshot snap_id=" << it->first << " "

diff --git a/src/librbd/operation/SnapshotCreateRequest.cc b/src/librbd/operation/SnapshotCreateRequest.cc
index 866ef7d610146d8e1ebb8d4d1f54cab50505e712..8cea35d2f035e012b76b1f668e2f18bbafa342fa 100644 (file)
--- a/src/librbd/operation/SnapshotCreateRequest.cc
+++ b/src/librbd/operation/SnapshotCreateRequest.cc
@@ -298,7 +298,7 @@ Context *SnapshotCreateRequest<I>::handle_create_object_map(int *result) {
 template <typename I>
 Context *SnapshotCreateRequest<I>::send_create_image_state() {
   I &image_ctx = this->m_image_ctx;
-  auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &m_snap_namespace);
   if (mirror_ns == nullptr || !mirror_ns->is_primary()) {
     update_snap_context();

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index 5b33597455643ab0c9ddacc39c4a8f6d05f2e5a6..aa6ca0ee2491c345db22a19242012430f8ffa819 100644 (file)
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -2256,7 +2256,7 @@ TEST_F(TestClsRbd, mirror_snapshot) {
 
   cls::rbd::SnapshotInfo snap;
   ASSERT_EQ(0, snapshot_get(&ioctx, oid, 1, &snap));
-  auto sn = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto sn = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   ASSERT_NE(nullptr, sn);
   ASSERT_EQ(primary, *sn);
@@ -2269,7 +2269,7 @@ TEST_F(TestClsRbd, mirror_snapshot) {
   ASSERT_EQ(-ENOENT, mirror_image_snapshot_unlink_peer(&ioctx, oid, 1,
                                                        "peer1"));
   ASSERT_EQ(0, snapshot_get(&ioctx, oid, 1, &snap));
-  sn = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  sn = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   ASSERT_NE(nullptr, sn);
   ASSERT_EQ(1U, sn->mirror_peer_uuids.size());
@@ -2278,14 +2278,14 @@ TEST_F(TestClsRbd, mirror_snapshot) {
   ASSERT_EQ(-ERESTART,
             mirror_image_snapshot_unlink_peer(&ioctx, oid, 1, "peer2"));
   ASSERT_EQ(0, snapshot_get(&ioctx, oid, 1, &snap));
-  sn = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  sn = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   ASSERT_NE(nullptr, sn);
   ASSERT_EQ(1U, sn->mirror_peer_uuids.size());
   ASSERT_EQ(1U, sn->mirror_peer_uuids.count("peer2"));
 
   ASSERT_EQ(0, snapshot_get(&ioctx, oid, 2, &snap));
-  auto nsn = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  auto nsn = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   ASSERT_NE(nullptr, nsn);
   ASSERT_EQ(non_primary, *nsn);
@@ -2297,7 +2297,7 @@ TEST_F(TestClsRbd, mirror_snapshot) {
   ASSERT_EQ(0, mirror_image_snapshot_set_copy_progress(&ioctx, oid, 2, true,
                                                        10));
   ASSERT_EQ(0, snapshot_get(&ioctx, oid, 2, &snap));
-  nsn = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+  nsn = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
     &snap.snapshot_namespace);
   ASSERT_NE(nullptr, nsn);
   ASSERT_TRUE(nsn->complete);

diff --git a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
index 6a52898220a73c73bb1fb01ffbe30a1562ee933e..0190c338ab03e3939415d83f66ae36d54c60766a 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_SnapshotCopyRequest.cc
@@ -252,8 +252,7 @@ public:
     }
 
     if (protect) {
-      EXPECT_TRUE(boost::get<cls::rbd::UserSnapshotNamespace>(&snap_ns) !=
-                    nullptr);
+      EXPECT_TRUE(std::holds_alternative<cls::rbd::UserSnapshotNamespace>(snap_ns));
       r = image_ctx->operations->snap_protect(snap_ns, snap_name.c_str());
       if (r < 0) {
         return r;

diff --git a/src/test/librbd/mirror/snapshot/test_mock_CreatePrimaryRequest.cc b/src/test/librbd/mirror/snapshot/test_mock_CreatePrimaryRequest.cc
index 95b25ffa12f0eba8680ff112dc89d1ed26d5543a..bf4d797443848348d37ee59ca78cf57648f37c19 100644 (file)
--- a/src/test/librbd/mirror/snapshot/test_mock_CreatePrimaryRequest.cc
+++ b/src/test/librbd/mirror/snapshot/test_mock_CreatePrimaryRequest.cc
@@ -178,7 +178,7 @@ public:
                            auto it = mock_image_ctx.snap_info.find(snap_id);
                            ASSERT_NE(it, mock_image_ctx.snap_info.end());
                            auto info =
-                             boost::get<cls::rbd::MirrorSnapshotNamespace>(
+                             std::get_if<cls::rbd::MirrorSnapshotNamespace>(
                                &it->second.snap_namespace);
                            ASSERT_NE(nullptr, info);
                            ASSERT_EQ(is_linked, info->mirror_peer_uuids.erase(

diff --git a/src/test/librbd/mirror/snapshot/test_mock_UnlinkPeerRequest.cc b/src/test/librbd/mirror/snapshot/test_mock_UnlinkPeerRequest.cc
index 456b6ccdca11ece0d8340625e07ed722e144faac..eebd9fd81819f1fa4135a1042e3b03ddf47afdaf 100644 (file)
--- a/src/test/librbd/mirror/snapshot/test_mock_UnlinkPeerRequest.cc
+++ b/src/test/librbd/mirror/snapshot/test_mock_UnlinkPeerRequest.cc
@@ -91,7 +91,7 @@ public:
                            auto it = mock_image_ctx.snap_info.find(snap_id);
                            EXPECT_NE(it, mock_image_ctx.snap_info.end());
                            auto info =
-                             boost::get<cls::rbd::MirrorSnapshotNamespace>(
+                             std::get_if<cls::rbd::MirrorSnapshotNamespace>(
                                &it->second.snap_namespace);
                            EXPECT_NE(nullptr, info);
                            EXPECT_NE(0, info->mirror_peer_uuids.erase(

diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc
index dcb74fdb61ba6b63d65616318c234748d46bc933..abe163cfd6925c1ea39cc4ba972d8f83e2969418 100644 (file)
--- a/src/test/rbd_mirror/test_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_ImageReplayer.cc
@@ -393,7 +393,7 @@ public:
         return r;
       }
 
-      auto ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+      auto ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
         &snap_info.snapshot_namespace);
       if (ns != nullptr) {
         *mirror_snap_id = snap_id;

diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc
index 2ed3217388f6d0edbc95db4c3c39fe238b46ae5f..75881307cee5ca0b0ee1c7381784db1e371c7f7d 100644 (file)
--- a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc
+++ b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc
@@ -238,7 +238,7 @@ void ApplyImageStateRequest<I>::unprotect_snapshot() {
     auto snap_id = snap_it->first;
     const auto& snap_info = snap_it->second;
 
-    auto user_ns = boost::get<cls::rbd::UserSnapshotNamespace>(
+    auto user_ns = std::get_if<cls::rbd::UserSnapshotNamespace>(
       &snap_info.snap_namespace);
     if (user_ns == nullptr) {
       dout(20) << "snapshot " << snap_id << " is not a user snapshot" << dendl;
@@ -324,7 +324,7 @@ void ApplyImageStateRequest<I>::remove_snapshot() {
     auto snap_id = snap_it->first;
     const auto& snap_info = snap_it->second;
 
-    auto user_ns = boost::get<cls::rbd::UserSnapshotNamespace>(
+    auto user_ns = std::get_if<cls::rbd::UserSnapshotNamespace>(
       &snap_info.snap_namespace);
     if (user_ns == nullptr) {
       dout(20) << "snapshot " << snap_id << " is not a user snapshot" << dendl;
@@ -398,7 +398,7 @@ void ApplyImageStateRequest<I>::protect_snapshot() {
     auto snap_id = snap_it->first;
     const auto& snap_info = snap_it->second;
 
-    auto user_ns = boost::get<cls::rbd::UserSnapshotNamespace>(
+    auto user_ns = std::get_if<cls::rbd::UserSnapshotNamespace>(
       &snap_info.snap_namespace);
     if (user_ns == nullptr) {
       dout(20) << "snapshot " << snap_id << " is not a user snapshot" << dendl;
@@ -484,7 +484,7 @@ void ApplyImageStateRequest<I>::rename_snapshot() {
     auto snap_id = snap_it->first;
     const auto& snap_info = snap_it->second;
 
-    auto user_ns = boost::get<cls::rbd::UserSnapshotNamespace>(
+    auto user_ns = std::get_if<cls::rbd::UserSnapshotNamespace>(
       &snap_info.snap_namespace);
     if (user_ns == nullptr) {
       dout(20) << "snapshot " << snap_id << " is not a user snapshot" << dendl;
@@ -608,7 +608,7 @@ uint64_t ApplyImageStateRequest<I>::compute_remote_snap_id(
   for (auto snap_it = m_remote_image_ctx->snap_info.begin();
        snap_it != m_remote_image_ctx->snap_info.end(); ++snap_it) {
     auto snap_id = snap_it->first;
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &snap_it->second.snap_namespace);
     if (mirror_ns == nullptr || !mirror_ns->is_non_primary()) {
       continue;

diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
index e94ec71dfe2d3275f2b7300a60c7170325bc6a30..60996bb864ec1c03809d4cd69d032b0d5c80f97b 100644 (file)
--- a/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
+++ b/src/tools/rbd_mirror/image_replayer/snapshot/Replayer.cc
@@ -58,7 +58,7 @@ std::pair<uint64_t, librbd::SnapInfo*> get_newest_mirror_snapshot(
   for (auto snap_info_it = image_ctx->snap_info.rbegin();
        snap_info_it != image_ctx->snap_info.rend(); ++snap_info_it) {
     const auto& snap_ns = snap_info_it->second.snap_namespace;
-    auto mirror_ns = boost::get<
+    auto mirror_ns = std::get_if<
       cls::rbd::MirrorSnapshotNamespace>(&snap_ns);
     if (mirror_ns == nullptr || !mirror_ns->complete) {
       continue;
@@ -446,7 +446,7 @@ void Replayer<I>::scan_local_mirror_snapshots(
   for (auto snap_info_it = local_image_ctx->snap_info.begin();
        snap_info_it != local_image_ctx->snap_info.end(); ++snap_info_it) {
     const auto& snap_ns = snap_info_it->second.snap_namespace;
-    auto mirror_ns = boost::get<
+    auto mirror_ns = std::get_if<
       cls::rbd::MirrorSnapshotNamespace>(&snap_ns);
     if (mirror_ns == nullptr) {
       continue;
@@ -576,7 +576,7 @@ void Replayer<I>::scan_remote_mirror_snapshots(
   for (auto snap_info_it = remote_image_ctx->snap_info.begin();
        snap_info_it != remote_image_ctx->snap_info.end(); ++snap_info_it) {
     const auto& snap_ns = snap_info_it->second.snap_namespace;
-    auto mirror_ns = boost::get<
+    auto mirror_ns = std::get_if<
       cls::rbd::MirrorSnapshotNamespace>(&snap_ns);
     if (mirror_ns == nullptr) {
       continue;
@@ -768,8 +768,8 @@ void Replayer<I>::prune_non_primary_snapshot(uint64_t snap_id) {
       snap_namespace = snap_info->snap_namespace;
       snap_name = snap_info->name;
 
-      ceph_assert(boost::get<cls::rbd::MirrorSnapshotNamespace>(
-        &snap_namespace) != nullptr);
+      ceph_assert(std::holds_alternative<cls::rbd::MirrorSnapshotNamespace>(
+        snap_namespace));
     }
   }
 
@@ -913,7 +913,7 @@ void Replayer<I>::create_non_primary_snapshot() {
       return;
     }
 
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &local_snap_info_it->second.snap_namespace);
     ceph_assert(mirror_ns != nullptr);
 
@@ -930,8 +930,8 @@ void Replayer<I>::create_non_primary_snapshot() {
 
       // we can ignore all non-user snapshots since image state only includes
       // user snapshots
-      if (boost::get<cls::rbd::UserSnapshotNamespace>(
-            &remote_snap_info.snap_namespace) == nullptr) {
+      if (!std::holds_alternative<cls::rbd::UserSnapshotNamespace>(
+            remote_snap_info.snap_namespace)) {
         continue;
       }
 

diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/Utils.cc b/src/tools/rbd_mirror/image_replayer/snapshot/Utils.cc
index 7c20410cbc3092506daf4db241fbad83258ec398..6df95d300e37a8359800cf1bcfed34e71131727e 100644 (file)
--- a/src/tools/rbd_mirror/image_replayer/snapshot/Utils.cc
+++ b/src/tools/rbd_mirror/image_replayer/snapshot/Utils.cc
@@ -29,7 +29,7 @@ uint64_t compute_remote_snap_id(
   // come at or after the snapshot we are searching against
   for (auto snap_it = local_snap_infos.lower_bound(local_snap_id);
        snap_it != local_snap_infos.end(); ++snap_it) {
-    auto mirror_ns = boost::get<cls::rbd::MirrorSnapshotNamespace>(
+    auto mirror_ns = std::get_if<cls::rbd::MirrorSnapshotNamespace>(
       &snap_it->second.snap_namespace);
     if (mirror_ns == nullptr || !mirror_ns->is_non_primary()) {
       continue;