From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 May 2020 16:38:12 +0000 (+0800)
Subject: crimson/osd: avoid using variadic future
X-Git-Tag: v16.1.0~2320^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cee25ba41069e9e9b4855f99be20910759440ca;p=ceph.git

crimson/osd: avoid using variadic future

it is deprecated by seastar. let's use future<tuple<...>> instead

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

diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc
index 5d36f3ac8e4be..d67387ce8eff8 100644
--- a/src/crimson/osd/ops_executer.cc
+++ b/src/crimson/osd/ops_executer.cc
@@ -564,11 +564,13 @@ static seastar::future<ceph::bufferlist> do_pgnls_common(
           // the sole purpose of this chaining is to pass `next` to 2nd
           // stage altogether with items
           logger().debug("do_pgnls_common: 1st done");
-          return seastar::make_ready_future<decltype(items), decltype(next)>(
-            std::move(items), std::move(next));
+          return seastar::make_ready_future<
+            std::tuple<std::vector<hobject_t>, hobject_t>>(
+              std::make_tuple(std::move(items), std::move(next)));
       });
   }).then(
-    [pg_end, filter] (const std::vector<hobject_t>& items, auto next) {
+    [pg_end, filter] (auto&& ret) {
+      auto& [items, next] = ret;
       auto is_matched = [] (const auto& obj) {
         return !obj.is_min();
       };