Merge pull request ceph#62464 from idryomov/wip-70632

librbd: respect rbd_default_snapshot_quiesce_mode in group_snap_create()

Reviewed-by: Prasanna Kumar Kalever <[email protected]>

Author: idryomov

src/librbd/Utils.cc

@@ -29,6 +29,18 @@ namespace {
 
 const std::string CONFIG_KEY_URI_PREFIX{"config://"};
 
+uint32_t quiesce_mode_to_snap_create_flags(const std::string& mode) {
+  if (mode == "required") {
+    return 0;
+  } else if (mode == "ignore-error") {
+    return RBD_SNAP_CREATE_IGNORE_QUIESCE_ERROR;
+  } else if (mode == "skip") {
+    return RBD_SNAP_CREATE_SKIP_QUIESCE;
+  } else {
+    ceph_abort_msg("invalid rbd_default_snapshot_quiesce_mode");
+  }
+}
+
 } // anonymous namespace
 
 const std::string group_header_name(const std::string &group_id)
@@ -181,15 +193,15 @@ uint32_t get_default_snap_create_flags(ImageCtx *ictx) {
   auto mode = ictx->config.get_val<std::string>(
       "rbd_default_snapshot_quiesce_mode");
 
-  if (mode == "required") {
-    return 0;
-  } else if (mode == "ignore-error") {
-    return RBD_SNAP_CREATE_IGNORE_QUIESCE_ERROR;
-  } else if (mode == "skip") {
-    return RBD_SNAP_CREATE_SKIP_QUIESCE;
-  } else {
-    ceph_abort_msg("invalid rbd_default_snapshot_quiesce_mode");
-  }
+  return quiesce_mode_to_snap_create_flags(mode);
+}
+
+uint32_t get_default_snap_create_flags(librados::IoCtx& group_ioctx) {
+  auto cct = reinterpret_cast<CephContext*>(group_ioctx.cct());
+  auto mode = cct->_conf.get_val<std::string>(
+      "rbd_default_snapshot_quiesce_mode");
+
+  return quiesce_mode_to_snap_create_flags(mode);
 }
 
 SnapContext get_snap_context(

src/librbd/Utils.h

@@ -268,6 +268,7 @@ int snap_create_flags_api_to_internal(CephContext *cct, uint32_t api_flags,
                                       uint64_t *internal_flags);
 
 uint32_t get_default_snap_create_flags(ImageCtx *ictx);
+uint32_t get_default_snap_create_flags(librados::IoCtx& group_ioctx);
 
 SnapContext get_snap_context(
     const std::optional<

src/librbd/api/Group.cc

@@ -922,8 +922,6 @@ int Group<I>::snap_create(librados::IoCtx& group_ioctx,
   if (r < 0) {
     return r;
   }
-  internal_flags &= ~(SNAP_CREATE_FLAG_SKIP_NOTIFY_QUIESCE |
-                      SNAP_CREATE_FLAG_IGNORE_NOTIFY_QUIESCE_ERROR);
 
   r = cls_client::dir_get_id(&group_ioctx, RBD_GROUP_DIRECTORY, group_name,
                              &group_id);
@@ -1012,10 +1010,11 @@ int Group<I>::snap_create(librados::IoCtx& group_ioctx,
     goto remove_record;
   }
 
-  if ((flags & RBD_SNAP_CREATE_SKIP_QUIESCE) == 0) {
+  if ((internal_flags & SNAP_CREATE_FLAG_SKIP_NOTIFY_QUIESCE) == 0) {
     ldout(cct, 20) << "Sending quiesce notification" << dendl;
     ret_code = notify_quiesce(ictxs, prog_ctx, &quiesce_requests);
-    if (ret_code != 0 && (flags & RBD_SNAP_CREATE_IGNORE_QUIESCE_ERROR) == 0) {
+    if (ret_code != 0 &&
+        (internal_flags & SNAP_CREATE_FLAG_IGNORE_NOTIFY_QUIESCE_ERROR) == 0) {
       goto remove_record;
     }
   }

src/librbd/librbd.cc

@@ -1425,8 +1425,9 @@ namespace librbd {
     tracepoint(librbd, group_snap_create_enter,
                group_ioctx.get_pool_name().c_str(),
 	       group_ioctx.get_id(), group_name, snap_name);
+    auto flags = librbd::util::get_default_snap_create_flags(group_ioctx);
     int r = librbd::api::Group<>::snap_create(group_ioctx, group_name,
-                                              snap_name, 0);
+                                              snap_name, flags);
     tracepoint(librbd, group_snap_create_exit, r);
     return r;
   }
@@ -7304,8 +7305,9 @@ extern "C" int rbd_group_snap_create(rados_ioctx_t group_p,
              group_ioctx.get_pool_name().c_str(),
 	     group_ioctx.get_id(), group_name, snap_name);
 
+  auto flags = librbd::util::get_default_snap_create_flags(group_ioctx);
   int r = librbd::api::Group<>::snap_create(group_ioctx, group_name,
-                                            snap_name, 0);
+                                            snap_name, flags);
   tracepoint(librbd, group_snap_create_exit, r);
 
   return r;