]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #49462 from rzarzynski/wip-bug-53789
authorLaura Flores <lflores@redhat.com>
Wed, 24 Jan 2024 20:00:03 +0000 (14:00 -0600)
committerGitHub <noreply@github.com>
Wed, 24 Jan 2024 20:00:03 +0000 (14:00 -0600)
osdc: fix the ENOCONN normalization in Objecter::_linger_reconnect()

1  2 
src/osdc/Objecter.cc

index 9c2daed3ba6ecd946c5f31db24ac59fa6a360d5e,5d3c4e88b123eed2598aaa37dddb904541e1fe9c..969b486d8997f554c63f91b4b10714b3b0c155db
@@@ -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));
        }
      }
    }