oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/nfs/Connection: fix assertion failure on mount timeout

Browse Source 
When nfs_destroy_context() is called while nfs_mount_async() is in
progress, libnfs invokes MountCallback(-EINTR) (but only if a NFS RPC
call is in progress; if the TCP connect is in progress, that callback
is not invoked).

If the mount operation had timed out, OnMountTimeout() set
mount_state=FINISHED, which triggered an assertion failure in
MountCallback(); this commit adds a check on whether the mount has
timed out and ignores the MountCallback.
This commit is contained in:
Max Kellermann 2024-05-13 16:39:46 +02:00
parent 84e8927b1b
commit ba1b8533a5
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/nfs/Connection.cxx
View File

@ -195,6 +195,12 @@ NfsConnection::~NfsConnection() noexcept
assert(context != nullptr);
socket_event.ReleaseSocket();
/* cancel the timer before calling nfs_destroy_context() so
MountCallback() knows the mount call is being canceled;
checking status==-EINTR would be ambiguous */
mount_timeout_event.Cancel();
nfs_destroy_context(context);
}
@ -533,6 +539,15 @@ NfsConnection::MountCallback(int status, [[maybe_unused]] nfs_context *nfs,
{
assert(GetEventLoop().IsInside());
assert(context == nfs);
if (!mount_timeout_event.IsPending()) {
/* called by nfs_destroy_context() while destructing
this NfsConnection instance */
assert(status == -EINTR);
assert(mount_state == MountState::FINISHED);
return;
}
assert(mount_state == MountState::WAITING);
mount_state = MountState::FINISHED;