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

googleapis · Sep 24, 2021 · 7e623e5 · 7e623e5
1 parent 76f143c
commit 7e623e5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/google/pubsub_v1/services/publisher/transports/base.py b/google/pubsub_v1/services/publisher/transports/base.py
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,

diff --git a/owlbot.py b/owlbot.py
@@ -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(