Close remote handles after uploads#4
Draft
numbereleven-a wants to merge 1 commit into
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Root cause
SftpUploadFileWstored the SFTP handle and SCP channel in adapterunique_ptrs, but destroying those adapters does not close the underlying libssh2 handle.As a result, an uploaded file could remain open for writing until the entire SFTP connection was disconnected. On Linux and OpenWrt, attempting to execute that file failed with
ETXTBSY:Verification
Tested against the current upstream
mainbranch on OpenWrt 23.05.5 while keeping the SFTP connection open.Before:
After:
No process retained an open file descriptor for the uploaded file after the fixed transfer completed.
The patched upstream source also builds successfully in x64 Release configuration.