Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix connection not release bug #353

Merged
merged 6 commits into from
Aug 12, 2024
Merged

fix connection not release bug #353

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a80718
fix connection not release bug
ghjhhyuyuy Jun 7, 2024
517be56
Merge branch 'master' into fix_connection_not_release_bug
wey-gu Jul 15, 2024
f6ddf1d
Merge branch 'master' into fix_connection_not_release_bug
wey-gu Jul 15, 2024
2923348
Merge branch 'master' into fix_connection_not_release_bug
wey-gu Aug 9, 2024
dd1c11b
Merge branch 'master' into fix_connection_not_release_bug
wey-gu Aug 9, 2024
40de17e
Address Nicole00's comment as agreed in review
wey-gu Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nebula3/gclient/net/Connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ def authenticate(self, user_name, password):
try:
resp = self._connection.authenticate(user_name, password)
if resp.error_code != ErrorCode.SUCCEEDED:
self._connection.is_used = False
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the transport is not closed, prefer self.close()

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it necessary to close the connection here? I tend to release the connection back to the connection pool and wait for the next authenticate

self._connection = None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Authenticate failed does not mean the connection is broken, Why set _connection = None, we can just set _connection.is_used as False.

Let's see the connection pool how to call authenticate function:

    def get_session(self, user_name, password, retry_connect=True):
        """get session

        :param user_name: the user name to authenticate graphd
        :param password: the password to authenticate graphd
        :param retry_connect:
        :return: Session
        """
        connection = self.get_connection()
        if connection is None:
            raise NotValidConnectionException()
        try:
            auth_result = connection.authenticate(user_name, password)
            return Session(connection, auth_result, self, retry_connect)
        except Exception:
            raise

the auth operation is undependent with connection, so auth failed does not Influence the connection unless there are IO Error.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I refer to the code under release function of session.py. I think you may right, self._connection.is_used = False is enought here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done as agreed.

raise AuthFailedException(resp.error_msg)
return AuthResult(
resp.session_id, resp.time_zone_offset_seconds, resp.time_zone_name
Expand Down
Loading