Skip to content

process: set publisher methods' max retry to 600s #495

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
plamut merged 3 commits into from
Sep 24, 2021
Merged

process: set publisher methods' max retry to 600s #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b6c2d
process: set publisher methods' max retry to 600s
plamut Sep 3, 2021
4d9de70
Merge branch 'main' into iss-494
plamut Sep 7, 2021
871c805
Merge branch 'main' into iss-494
plamut Sep 24, 2021
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
18 changes: 9 additions & 9 deletions google/pubsub_v1/services/publisher/transports/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def _prep_wrapped_messages(self, client_info):
predicate=retries.if_exception_type(
core_exceptions.ServiceUnavailable,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -183,7 +183,7 @@ def _prep_wrapped_messages(self, client_info):
predicate=retries.if_exception_type(
core_exceptions.ServiceUnavailable,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -203,7 +203,7 @@ def _prep_wrapped_messages(self, client_info):
core_exceptions.ServiceUnavailable,
core_exceptions.Unknown,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -219,7 +219,7 @@ def _prep_wrapped_messages(self, client_info):
core_exceptions.ServiceUnavailable,
core_exceptions.Unknown,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -235,7 +235,7 @@ def _prep_wrapped_messages(self, client_info):
core_exceptions.ServiceUnavailable,
core_exceptions.Unknown,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -251,7 +251,7 @@ def _prep_wrapped_messages(self, client_info):
core_exceptions.ServiceUnavailable,
core_exceptions.Unknown,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -267,7 +267,7 @@ def _prep_wrapped_messages(self, client_info):
core_exceptions.ServiceUnavailable,
core_exceptions.Unknown,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -281,7 +281,7 @@ def _prep_wrapped_messages(self, client_info):
predicate=retries.if_exception_type(
core_exceptions.ServiceUnavailable,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand All @@ -295,7 +295,7 @@ def _prep_wrapped_messages(self, client_info):
predicate=retries.if_exception_type(
core_exceptions.ServiceUnavailable,
),
deadline=60.0,
deadline=600.0,
),
default_timeout=60.0,
client_info=client_info,
Expand Down
11 changes: 11 additions & 0 deletions owlbot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,17 @@
("\g<1>timeout (TimeoutType):\n" "\g<1> \g<2>\n"),
)

# Override the default max retry deadline for publisher methods.
count = s.replace(
library / f"google/pubsub_{library.name}/services/publisher/transports/base.py",
r"deadline=60\.0",
"deadline=600.0",
)
if count < 9:
raise Exception(
"Default retry deadline not overriden for all publisher methods."
)

# The namespace package declaration in google/cloud/__init__.py should be excluded
# from coverage.
count = s.replace(
Expand Down