Skip to content

fix(datastore): pass retry and timeout to begin when commit starts the transaction #18939

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

Open
abhishekacharya200 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(datastore): pass retry and timeout to begin when commit starts the transaction #18939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/google-cloud-datastore/google/cloud/datastore/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def commit(self, retry=None, timeout=None):
self._id = None
return None
else:
self.begin()
self.begin(retry=retry, timeout=timeout)

kwargs = _make_retry_timeout_kwargs(retry, timeout)

Expand Down
28 changes: 26 additions & 2 deletions packages/google-cloud-datastore/tests/unit/test_transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,28 @@ def test_transaction_put_w_begin_later(database_id):
assert xact._status == xact._INITIAL


@pytest.mark.parametrize("database_id", [None, "somedb"])
def test_transaction_commit_w_begin_later_w_retry_w_timeout(database_id):
"""
If commit has to begin the transaction, it should use the same retry and timeout
"""
project = "PROJECT"
id_ = 943243
retry = mock.Mock()
timeout = 100000
ds_api = _make_datastore_api(xact_id=id_)
client = _Client(project, datastore_api=ds_api, database=database_id)
xact = _make_transaction(client, begin_later=True)
xact._status = xact._INITIAL
xact.put(_Entity(database=database_id))

xact.commit(retry=retry, timeout=timeout)

ds_api.begin_transaction.assert_called_once_with(
request=mock.ANY, retry=retry, timeout=timeout
)


@pytest.mark.parametrize("database_id", [None, "somedb"])
def test_transaction_delete_w_begin_later(database_id):
"""
Expand Down Expand Up @@ -562,9 +584,11 @@ def test_transaction_commit_no_begin(database_id):
xact.put(entity)
assert xact._status == xact._INITIAL
with mock.patch.object(xact, "begin") as begin:
begin.side_effect = lambda: setattr(xact, "_status", xact._IN_PROGRESS)
begin.side_effect = lambda **kwargs: setattr(
xact, "_status", xact._IN_PROGRESS
)
xact.commit()
begin.assert_called_once_with()
begin.assert_called_once_with(retry=None, timeout=None)


@pytest.mark.parametrize("database_id", [None, "somedb"])
Expand Down
Loading