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

Jump to bottom

feat: add retry and timeout for batch dml #1107

Merged
merged 7 commits into from
Mar 6, 2024
Merged

feat: add retry and timeout for batch dml #1107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d020caf
feat(spanner): add retry, timeout for batch update
harshachinta Feb 26, 2024
154cdee
feat(spanner): add samples for retry, timeout
harshachinta Feb 26, 2024
8efa9a5
feat(spanner): update unittest
harshachinta Feb 26, 2024
74279ba
feat(spanner): update comments
harshachinta Mar 6, 2024
473f320
Merge branch 'main' into retry_timeout_batch_dml
harshachinta Mar 6, 2024
b4a155d
feat(spanner): update code for retry
harshachinta Mar 6, 2024
66535e1
feat(spanner): update comment
harshachinta Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(spanner): add samples for retry, timeout
  • Loading branch information
@harshachinta
harshachinta committed Feb 26, 2024
commit 154cdee7fe5bc064260fc454b8fbd4f2eff66645
32 changes: 32 additions & 0 deletions samples/samples/snippets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2796,6 +2796,33 @@ def directed_read_options(
# [END spanner_directed_read]


def set_custom_timeout_and_retry(instance_id, database_id):
"""Executes a snapshot read with custom timeout and retry."""
# [START spanner_set_custom_timeout_and_retry]
from google.api_core.retry import Retry

# instance_id = "your-spanner-instance"
# database_id = "your-spanner-db-id"
spanner_client = spanner.Client()
instance = spanner_client.instance(instance_id)
database = instance.database(database_id)

retry = Retry(initial=5, maximum=100, multiplier=2, timeout=60)
harshachinta marked this conversation as resolved.
Show resolved Hide resolved

# Set a custom retry and timeout setting.
with database.snapshot() as snapshot:
results = snapshot.execute_sql(
"SELECT SingerId, AlbumId, AlbumTitle FROM Albums",
retry=retry,
timeout=60,
)

for row in results:
print("SingerId: {}, AlbumId: {}, AlbumTitle: {}".format(*row))

# [END spanner_set_custom_timeout_and_retry]


if __name__ == "__main__": # noqa: C901
parser = argparse.ArgumentParser(
description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
Expand Down Expand Up @@ -2936,6 +2963,9 @@ def directed_read_options(
)
enable_fine_grained_access_parser.add_argument("--title", default="condition title")
subparsers.add_parser("directed_read_options", help=directed_read_options.__doc__)
subparsers.add_parser(
"set_custom_timeout_and_retry", help=set_custom_timeout_and_retry.__doc__
)

args = parser.parse_args()

Expand Down Expand Up @@ -3069,3 +3099,5 @@ def directed_read_options(
)
elif args.command == "directed_read_options":
directed_read_options(args.instance_id, args.database_id)
elif args.command == "set_custom_timeout_and_retry":
set_custom_timeout_and_retry(args.instance_id, args.database_id)
7 changes: 7 additions & 0 deletions samples/samples/snippets_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,3 +859,10 @@ def test_directed_read_options(capsys, instance_id, sample_database):
snippets.directed_read_options(instance_id, sample_database.database_id)
out, _ = capsys.readouterr()
assert "SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk" in out


@pytest.mark.dependency(depends=["insert_data"])
def test_set_custom_timeout_and_retry(capsys, instance_id, sample_database):
snippets.set_custom_timeout_and_retry(instance_id, sample_database.database_id)
out, _ = capsys.readouterr()
assert "SingerId: 1, AlbumId: 1, AlbumTitle: Total Junk" in out