From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 8 Sep 2021 15:54:23 +0000 (+0000)
Subject: crimson/net: simplify error handling in FixedCPUServerSocket::listen().
X-Git-Tag: v17.1.0~883^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=093586ff313db9c12e5b4d1b9eb5210a8adf8aa8;p=ceph.git

crimson/net: simplify error handling in FixedCPUServerSocket::listen().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/net/Socket.cc b/src/crimson/net/Socket.cc
index 990c191a250d..a2a7b1701b81 100644
--- a/src/crimson/net/Socket.cc
+++ b/src/crimson/net/Socket.cc
@@ -211,22 +211,16 @@ FixedCPUServerSocket::listen(entity_addr_t addr)
     lo.set_fixed_cpu(ss.cpu);
     ss.listener = seastar::listen(s_addr, lo);
   }).then([] {
-    return true;
-  }).handle_exception_type([addr] (const std::system_error& e) {
+    return listen_ertr::now();
+  }).handle_exception_type(
+    [addr] (const std::system_error& e) -> listen_ertr::future<> {
     if (e.code() == std::errc::address_in_use) {
       logger().trace("FixedCPUServerSocket::listen({}): address in use", addr);
-    } else {
-      logger().error("FixedCPUServerSocket::listen({}): "
-                     "got unexpeted error {}", addr, e);
-      ceph_abort();
-    }
-    return false;
-  }).then([] (bool success) -> listen_ertr::future<> {
-    if (success) {
-      return listen_ertr::now();
-    } else {
       return crimson::ct_error::address_in_use::make();
     }
+    logger().error("FixedCPUServerSocket::listen({}): "
+                   "got unexpeted error {}", addr, e);
+    ceph_abort();
   });
 }