Make sure the SSHClient is also closed when using connection in context manager from SFTPHook #46716
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
potiuk
force-pushed
the
fix/sftp-connection-leak
branch
from
ffc43f1 to
9ede9f2
Compare
Member
|
Rebased. Let's see if my #46608 PR will fis it :) |
potiuk
approved these changes
Feb 15, 2025
Member
|
Seems it does :) |
potiuk
approved these changes
Feb 15, 2025
Contributor
Author
|
Thx @potiuk |
dantonbertuol
pushed a commit
to dantonbertuol/airflow
that referenced
this pull request
Feb 17, 2025
…xt manager from SFTPHook (apache#46716) * fix: Make sure the SSHClient is also closed when getting a SFTPClient connection * refactor: Changed call of super get_conn in SFTPHook * refactor: Only open connection when call on connection has to be done * refactor: Added types for files and dirs --------- Co-authored-by: David Blain <david.blain@infrabel.be> Co-authored-by: David Blain <david.blain@b-holding.be>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This pull request fixes a connection leak issue when using the SFTPHook get_conn method which yields a closable sftp connection.
The issue is the connection from the SFTPClient get closed automatically but not the one from the SSHClient, leaving the connection open until the SFTPHook isn't used anymore, this PR make sure the SSHClient also get automatically closed once the SFTP connection isn't needed anymore.
Added an assertion in test_get_close_conn of TestSFTPHook to test this behaviour.
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in newsfragments.