Set timeout to infinite for publishing with ordering keys enabled

googleapis · Apr 3, 2024 · a926ad1 · a926ad1
1 parent 8c7e2a9
commit a926ad1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/google/cloud/pubsub_v1/publisher/client.py b/google/cloud/pubsub_v1/publisher/client.py
@@ -399,8 +399,10 @@ def on_publish_done(future):
  transport = self._transport
  base_retry = transport._wrapped_methods[transport.publish]._retry
  retry = base_retry.with_deadline(2.0**32)
+ timeout = 2.0**32
  elif retry is not None:
  retry = retry.with_deadline(2.0**32)
+ timeout = 2.0**32
 
  # Delegate the publishing to the sequencer.
  sequencer = self._get_or_create_sequencer(topic, ordering_key)

diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -28,9 +28,11 @@
 
 import pytest
 import time
+from typing import cast
 
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core import exceptions as core_exceptions
 from google.api_core.gapic_v1.client_info import METRICS_METADATA_KEY
 from google.cloud.pubsub_v1 import publisher
 from google.cloud.pubsub_v1 import types
@@ -316,6 +318,10 @@ def test_publish_with_ordering_key_uses_extended_retry_deadline(creds):
  expected_retry = custom_retry.with_deadline(2.0**32)
  _assert_retries_equal(batch_commit_retry, expected_retry)
 
+ batch_commit_timeout = kwargs["commit_timeout"]
+ expected_timeout = 2.0**32
+ assert batch_commit_timeout == pytest.approx(expected_timeout)
+
 
 def test_publish_with_ordering_key_with_no_retry(creds):
  client = publisher.Client(