From: Sage Weil <sage@redhat.com>
Date: Fri, 31 May 2019 21:33:22 +0000 (-0500)
Subject: mon/OSDMonitor: send MRemoveSnaps back to octopus MDS
X-Git-Tag: v15.1.0~2308^2~39
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e457b73075b63433a63f6ddbf945555f2573a5ee;p=ceph-ci.git

mon/OSDMonitor: send MRemoveSnaps back to octopus MDS

The octopus MDS wants an explicit ack when snaps are removed.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 72298fd7043..874108287be 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3589,6 +3589,12 @@ bool OSDMonitor::preprocess_remove_snaps(MonOpRequestRef op)
     }
   }
 
+  if (HAVE_FEATURE(m->get_connection()->get_features(), SERVER_OCTOPUS)) {
+    auto reply = make_message<MRemoveSnaps>();
+    reply->snaps = m->snaps;
+    mon->send_reply(op, reply.detach());
+  }
+
  ignore:
   return true;
 }
@@ -3633,6 +3639,13 @@ bool OSDMonitor::prepare_remove_snaps(MonOpRequestRef op)
       }
     }
   }
+
+  if (HAVE_FEATURE(m->get_connection()->get_features(), SERVER_OCTOPUS)) {
+    auto reply = make_message<MRemoveSnaps>();
+    reply->snaps = m->snaps;
+    wait_for_finished_proposal(op, new C_ReplyOp(this, op, reply));
+  }
+
   return true;
 }