]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/monc: don't assume reopen_session() shall establish active_con.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 18 Feb 2021 21:38:06 +0000 (21:38 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 22 Feb 2021 15:50:58 +0000 (15:50 +0000)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/mon/MonClient.cc

index 410285fccbf02c2c4b9fa7fac19161b5972f8b0e..b2e954a457904c4a9a0ac50322312bc5de11a3cd 100644 (file)
@@ -513,7 +513,9 @@ void Client::tick()
                                        active_con->renew_tickets(),
                                        active_con->renew_rotating_keyring()).then_unpack([] {});
     } else {
-      return seastar::now();
+      assert(is_hunting());
+      logger().info("{} continuing the hunt", __func__);
+      return authenticate();
     }
   });
 }
@@ -1032,8 +1034,8 @@ seastar::future<> Client::reopen_session(int rank)
     });
   }).then([this] {
     if (!active_con) {
-      return seastar::make_exception_future(
-         crimson::common::system_shutdown_exception());
+      logger().warn("cannot establish the active_con with any mon");
+      return seastar::now();
     }
     return active_con->renew_rotating_keyring();
   });