From: Laura Flores <lflores@redhat.com>
Date: Wed, 24 Jan 2024 20:00:03 +0000 (-0600)
Subject: Merge pull request #49462 from rzarzynski/wip-bug-53789
X-Git-Tag: v19.3.0~170
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd2edcf9d9ddf4f0881b4054de8095da410ece99;p=ceph.git

Merge pull request #49462 from rzarzynski/wip-bug-53789

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

cd2edcf9d9ddf4f0881b4054de8095da410ece99
diff --cc src/osdc/Objecter.cc
index 9c2daed3ba6e,5d3c4e88b123..969b486d8997
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -671,10 -670,10 +671,10 @@@ void Objecter::_linger_reconnect(Linger
  		 << " (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));
 +	asio::defer(finish_strand, CB_DoWatchError(this, info, ec));
        }
      }
    }