update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / librbd / mirror / snapshot / CreateNonPrimaryRequest.cc

diff --git a/ceph/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc b/ceph/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
index 6d5588d7f2c4667d93a650bc60bed203e5a40efb..eed0aa506a303c24f3322c7bde1a2bda618ac581 100644 (file)
--- a/ceph/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
+++ b/ceph/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
@@ -51,7 +51,7 @@ void CreateNonPrimaryRequest<I>::refresh_image() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
@@ -62,7 +62,7 @@ void CreateNonPrimaryRequest<I>::refresh_image() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_refresh_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to refresh image: " << cpp_strerror(r) << dendl;
@@ -76,7 +76,7 @@ void CreateNonPrimaryRequest<I>::handle_refresh_image(int r) {
 template <typename I>
 void CreateNonPrimaryRequest<I>::get_mirror_image() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::mirror_image_get_start(&op, m_image_ctx->id);
@@ -92,7 +92,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_image() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_get_mirror_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   cls::rbd::MirrorImage mirror_image;
   if (r == 0) {
@@ -134,7 +134,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_peers() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::mirror_peer_list_start(&op);
@@ -151,7 +151,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_peers() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_get_mirror_peers(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   std::vector<cls::rbd::MirrorPeer> peers;
   if (r == 0) {
@@ -189,18 +189,18 @@ void CreateNonPrimaryRequest<I>::create_snapshot() {
   }
   ns.snap_seqs = m_snap_seqs;
   ns.complete = is_orphan();
-  ldout(cct, 20) << "ns=" << ns << dendl;
+  ldout(cct, 15) << "ns=" << ns << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
     &CreateNonPrimaryRequest<I>::handle_create_snapshot>(this);
-  m_image_ctx->operations->snap_create(ns, m_snap_name, ctx);
+  m_image_ctx->operations->snap_create(ns, m_snap_name, 0, m_prog_ctx, ctx);
 }
 
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_create_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create mirror snapshot: " << cpp_strerror(r)
@@ -231,7 +231,7 @@ void CreateNonPrimaryRequest<I>::write_image_state() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
@@ -245,7 +245,7 @@ void CreateNonPrimaryRequest<I>::write_image_state() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_write_image_state(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to write image state: " << cpp_strerror(r)
@@ -260,7 +260,7 @@ void CreateNonPrimaryRequest<I>::handle_write_image_state(int r) {
 template <typename I>
 void CreateNonPrimaryRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;