]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: use discard_result() in stop()
authorKefu Chai <kchai@redhat.com>
Thu, 24 Jun 2021 06:16:07 +0000 (14:16 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 24 Jun 2021 08:07:29 +0000 (16:07 +0800)
we don't care about the result of shutdown() of messengers, when
shutting down the daemon actually, and we don't handle the failures.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/osd.cc

index 65cf8cc459d96971358140fe21e040516da0a59a..74ca49ea451324cb64b82bf0759fbd3d92d32198 100644 (file)
@@ -507,9 +507,7 @@ seastar::future<> OSD::stop()
     }).then([this] {
       return when_all_succeed(
          public_msgr->shutdown(),
-         cluster_msgr->shutdown());
-    }).then_unpack([] {
-      return seastar::now();
+         cluster_msgr->shutdown()).discard_result();
     }).handle_exception([](auto ep) {
       logger().error("error while stopping osd: {}", ep);
     });