Skip to content
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

fix: Remove Bidi ModAcks on StreamingPull initial request #738

Merged
merged 6 commits into from
Jul 15, 2022
Merged

fix: Remove Bidi ModAcks on StreamingPull initial request #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40cfbc4
modify samples
acocuzzo Jul 13, 2022
a40ee92
remove bidi modacks from initial request
acocuzzo Jul 14, 2022
b031306
add empty lists
acocuzzo Jul 14, 2022
1587704
revert quickstart tests
acocuzzo Jul 14, 2022
e0d5fd6
revert samples changes
acocuzzo Jul 14, 2022
92d57fe
lint
acocuzzo Jul 14, 2022
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
13 changes: 2 additions & 11 deletions google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,20 +927,11 @@ def _get_initial_request(
A request suitable for being the first request on the stream (and not
suitable for any other purpose).
"""
# Any ack IDs that are under lease management need to have their
# deadline extended immediately.
if self._leaser is not None:
# Explicitly copy the list, as it could be modified by another
# thread.
lease_ids = list(self._leaser.ack_ids)
else:
lease_ids = []

# Put the request together.
request = gapic_types.StreamingPullRequest(
modify_deadline_ack_ids=list(lease_ids),
modify_deadline_seconds=[self.ack_deadline] * len(lease_ids),
stream_ack_deadline_seconds=stream_ack_deadline_seconds,
modify_deadline_ack_ids=[],
modify_deadline_seconds=[],
subscription=self._subscription,
client_id=self._client_id,
max_outstanding_messages=(
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,8 +1318,8 @@ def test__get_initial_request():
assert isinstance(initial_request, gapic_types.StreamingPullRequest)
assert initial_request.subscription == "subscription-name"
assert initial_request.stream_ack_deadline_seconds == 123
assert initial_request.modify_deadline_ack_ids == ["1", "2"]
assert initial_request.modify_deadline_seconds == [10, 10]
assert initial_request.modify_deadline_ack_ids == []
assert initial_request.modify_deadline_seconds == []


def test__get_initial_request_wo_leaser():
Expand Down