-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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(tableau): retry on InternalServerError 504 #12213
Merged
sgomezvillamor
merged 4 commits into
master
from
feature/cus-3546-fix-tableau-internalsevererror-504
Dec 24, 2024
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
90dc243
fix(tableau): retry on InternalServerError 504
sgomezvillamor e1d632b
adds missing else case
sgomezvillamor 8d40e2f
Merge branch 'master' into feature/cus-3546-fix-tableau-internalsever…
sgomezvillamor 73aef04
Merge branch 'master' into feature/cus-3546-fix-tableau-internalsever…
sgomezvillamor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,7 +35,10 @@ | |
SiteItem, | ||
TableauAuth, | ||
) | ||
from tableauserverclient.server.endpoint.exceptions import NonXMLResponseError | ||
from tableauserverclient.server.endpoint.exceptions import ( | ||
InternalServerError, | ||
NonXMLResponseError, | ||
) | ||
from urllib3 import Retry | ||
|
||
import datahub.emitter.mce_builder as builder | ||
|
@@ -1196,6 +1199,24 @@ | |
retry_on_auth_error=False, | ||
retries_remaining=retries_remaining - 1, | ||
) | ||
|
||
except InternalServerError as ise: | ||
# In some cases Tableau Server returns 504 error, which is a timeout error, so it worths to retry. | ||
if ise.code == 504: | ||
if retries_remaining <= 0: | ||
raise ise | ||
return self.get_connection_object_page( | ||
query=query, | ||
connection_type=connection_type, | ||
query_filter=query_filter, | ||
fetch_size=fetch_size, | ||
current_cursor=current_cursor, | ||
retry_on_auth_error=False, | ||
retries_remaining=retries_remaining - 1, | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we need an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. indeed |
||
else: | ||
raise ise | ||
|
||
except OSError: | ||
# In tableauseverclient 0.26 (which was yanked and released in 0.28 on 2023-10-04), | ||
# the request logic was changed to use threads. | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not a huge fan of this entire method - it feels way more complicated than it needs to be and has a ton of mostly duplicated code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree
If this works, we should invest some time on a refactor.