Skip to content

Added info logging for response #511

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

Merged
merged 7 commits into from
Feb 23, 2025
Merged

Added info logging for response #511

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a559ee
Added some logging support
jprakash-db Feb 19, 2025
9944f78
Logs are based on what the server returns
jprakash-db Feb 20, 2025
9ffaee4
Added back some of the better errors
jprakash-db Feb 21, 2025
547d55b
Print status if not detected as error
jprakash-db Feb 21, 2025
f305198
Added logging in the flush step
jprakash-db Feb 22, 2025
c4aad86
Reformatted
jprakash-db Feb 22, 2025
17838ee
Removed some unnecessary
jprakash-db Feb 22, 2025
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
28 changes: 16 additions & 12 deletions src/databricks/sql/auth/retry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,23 +345,24 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:
if a retry would violate the configured policy.
"""

logger.info(f"Received status code {status_code} for {method} request")
Copy link
Collaborator

Choose a reason for hiding this comment

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

When we get 4xx or 5xx, do we only get a status code, or do we also get an error message of some sort?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@benc-db I have updated such that the error messages from the server are printed and not our custom messages


# Request succeeded. Don't retry.
if status_code == 200:
return False, "200 codes are not retried"

if status_code == 401:
raise NonRecoverableNetworkError(
"Received 401 - UNAUTHORIZED. Confirm your authentication credentials."
return (
False,
"Received 401 - UNAUTHORIZED. Confirm your authentication credentials.",
)

if status_code == 403:
raise NonRecoverableNetworkError(
"Received 403 - FORBIDDEN. Confirm your authentication credentials."
)
return False, "403 codes are not retried"

# Request failed and server said NotImplemented. This isn't recoverable. Don't retry.
if status_code == 501:
raise NonRecoverableNetworkError("Received code 501 from server.")
return False, "Received code 501 from server."

# Request failed and this method is not retryable. We only retry POST requests.
if not self._is_method_retryable(method):
Expand All @@ -380,8 +381,9 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:
and self.command_type == CommandType.CLOSE_SESSION
and len(self.history) > 0
):
raise SessionAlreadyClosedError(
"CloseSession received 404 code from Databricks. Session is already closed."
return (
False,
"CloseSession received 404 code from Databricks. Session is already closed.",
)

# Request failed with 404 because CloseOperation returns 404 if you repeat the request.
Expand All @@ -390,8 +392,9 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:
and self.command_type == CommandType.CLOSE_OPERATION
and len(self.history) > 0
):
raise CursorAlreadyClosedError(
"CloseOperation received 404 code from Databricks. Cursor is already closed."
return (
False,
"CloseOperation received 404 code from Databricks. Cursor is already closed.",
)

# Request failed, was an ExecuteStatement and the command may have reached the server
Expand All @@ -400,8 +403,9 @@ def should_retry(self, method: str, status_code: int) -> Tuple[bool, str]:
and status_code not in self.status_forcelist
and status_code not in self.force_dangerous_codes
):
raise UnsafeToRetryError(
"ExecuteStatement command can only be retried for codes 429 and 503"
return (
False,
"ExecuteStatement command can only be retried for codes 429 and 503",
)

# Request failed with a dangerous code, was an ExecuteStatement, but user forced retries for this
Expand Down
Loading