Merge pull request ceph#60938 from joscollin/wip-fix-try-lock

vshankar · web-flow · commit 1eccade488c0 · 2025-03-04T18:21:23.000+05:30
cephfs_mirror: do not log the previous error

Reviewed-by: Venky Shankar &lt;vshankar@redhat.com&gt;
diff --git a/src/tools/cephfs_mirror/PeerReplayer.cc b/src/tools/cephfs_mirror/PeerReplayer.cc
@@ -451,7 +451,8 @@ int PeerReplayer::try_lock_directory(const std::string &dir_root,
            << dendl;
     }
 
-    if (ceph_close(m_remote_mount, fd) < 0) {
+    r = ceph_close(m_remote_mount, fd);
+    if (r < 0) {
       derr << ": failed to close (cleanup) remote dir_root=" << dir_root << ": "
            << cpp_strerror(r) << dendl;
     }

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,8 @@ int PeerReplayer::try_lock_directory(const std::string &dir_root,`
`451`	`451`	`<< dendl;`
`452`	`452`	`}`
`453`	`453`
`454`		`- if (ceph_close(m_remote_mount, fd) < 0) {`
	`454`	`+ r = ceph_close(m_remote_mount, fd);`
	`455`	`+ if (r < 0) {`
`455`	`456`	`derr << ": failed to close (cleanup) remote dir_root=" << dir_root << ": "`
`456`	`457`	`<< cpp_strerror(r) << dendl;`
`457`	`458`	`}`