From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 15 Dec 2022 16:58:51 +0000 (+0000)
Subject: osdc: fix the ENOCONN normalization in Objecter::_linger_reconnect()
X-Git-Tag: v19.3.0~170^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73ddc4d202113c3dd4b09d602287f09358e2495a;p=ceph.git

osdc: fix the ENOCONN normalization in Objecter::_linger_reconnect()

Problem's description: https://tracker.ceph.com/issues/53789#note-12

Fixes: https://tracker.ceph.com/issues/53789
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index eff79c5e9061..5d3c4e88b123 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -670,8 +670,8 @@ void Objecter::_linger_reconnect(LingerOp *info, bs::error_code ec)
 		 << " (last_error " << info->last_error << ")" << dendl;
   std::unique_lock wl(info->watch_lock);
   if (ec) {
+    ec = _normalize_watch_error(ec);
     if (!info->last_error) {
-      ec = _normalize_watch_error(ec);
       if (info->handle) {
 	boost::asio::defer(finish_strand, CB_DoWatchError(this, info, ec));
       }