From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Oct 2019 07:02:59 +0000 (+0800)
Subject: crimson/osd: always init BufferedRecoveryMessages w/ octopus
X-Git-Tag: v15.1.0~1291^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30834%2Fhead;p=ceph.git

crimson/osd: always init BufferedRecoveryMessages w/ octopus

we don't need to be compatible with pre-octopus releases

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/shard_services.cc b/src/crimson/osd/shard_services.cc
index f727c66ca24a..c029674f1de2 100644
--- a/src/crimson/osd/shard_services.cc
+++ b/src/crimson/osd/shard_services.cc
@@ -95,7 +95,8 @@ seastar::future<> ShardServices::dispatch_context(
 {
   ceph_assert(col || ctx.transaction.empty());
   return seastar::when_all_succeed(
-    dispatch_context_messages(BufferedRecoveryMessages(ctx)),
+    dispatch_context_messages(
+      BufferedRecoveryMessages{ceph_release_t::octopus, ctx}),
     col ? dispatch_context_transaction(col, ctx) : seastar::now());
 }