feat(x-goog-spanner-request-id): implement Request-ID #1264
+1,822
−159
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🤖 I detect that the PR title and the commit message differ and there's only one commit. To use the PR title for the commit history, you can use Github's automerge feature with squashing, or use -- conventional-commit-lint bot |
product-auto-label
bot
added
the
api: spanner
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
2451afe to
4f1da67
Compare
odeke-em
changed the title
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
b021c9e to
47da5e4
Compare
product-auto-label
bot
added
size: l
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
8616572 to
caa60c2
Compare
odeke-em
added a commit
to odeke-em/python-spanner
that referenced
this pull request
Dec 18, 2024
This change introduces AtomicCounter, a concurrency/thread-safe counter do deal with the multi-threaded nature of variables. It permits operations: * atomic_counter += 1 * value = atomic_counter + 1 * atomic_counter.value that'll be paramount to bringing in the logic for x-goog-spanner-request-id in much reduced changelists. Updates googleapis#1261 Carved out from PR googleapis#1264
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
9903cac to
529333a
Compare
product-auto-label
bot
added
size: xl
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
olavloite
added a commit
that referenced
this pull request
Dec 19, 2024
* feat(x-goog-spanner-request-id): introduce AtomicCounter This change introduces AtomicCounter, a concurrency/thread-safe counter do deal with the multi-threaded nature of variables. It permits operations: * atomic_counter += 1 * value = atomic_counter + 1 * atomic_counter.value that'll be paramount to bringing in the logic for x-goog-spanner-request-id in much reduced changelists. Updates #1261 Carved out from PR #1264 * Tests for with_request_id * chore: remove sleep * chore: remove unused import --------- Co-authored-by: Knut Olav Løite <[email protected]>
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
2d6a3ea to
65757b5
Compare
olavloite
reviewed
Dec 24, 2024
google/cloud/spanner_v1/database.py
Outdated
| @@ -698,10 +728,20 @@ def execute_partitioned_dml( | |||
| _metadata_with_leader_aware_routing(self._route_to_leader_enabled) | |||
| ) | |||
|
|
|||
| # Attempt will be incremented inside _restart_on_unavailable. | |||
There was a problem hiding this comment.
I assume that this comment applies to partial_attempt, no? If so, can we move it down to that variable.
There was a problem hiding this comment.
It applies to begin_txn_attempt and I've updated the comment and moving the comment before the variable itself. Thank you.
google/cloud/spanner_v1/database.py
Outdated
| trace_name="CloudSpanner.ExecuteStreamingSql", | ||
| request=request, | ||
| transaction_selector=txn_selector, | ||
| observability_options=self.observability_options, | ||
| attempt=begin_txn_attempt, |
There was a problem hiding this comment.
I think that this should be partial_attempt. Retries of this RPC will not retry the BeginTransaction RPC, it will just continue to use the same transaction ID as the one that was returned by the original BeginTransaction RPC.
There was a problem hiding this comment.
Oooh, okay, that's very interesting and thanks for letting me know, let me make that update.
There was a problem hiding this comment.
I did however already pass in and increment partial_attempt inside wrapped_method. I'll instead remove that and increment them in the appropriate sites.
tests/unit/test_request_id_header.py
Outdated
| ] | ||
| assert got_stream_segments == want_stream_segments | ||
|
|
||
| def test_database_run_in_transaction_retries_on_abort(self): |
There was a problem hiding this comment.
This test does not appear to actually verify anything (other than that it does not cause any errors). Can we either remove it, or add verifications for the scenario it should cover?
tests/unit/test_session.py
Outdated
| ("x-goog-spanner-route-to-leader", "true"), | ||
| ( | ||
| "x-goog-spanner-request-id", | ||
| f"1.{REQ_RAND_PROCESS_ID}.{database.NTH_CLIENT.value}.1.2.2", |
There was a problem hiding this comment.
Is attempt set to 2 here because the transaction is retried? If so, then that is not correct. The attempt number should only be increased if the RPC itself is being retried due to a retryable error for that (single) RPC. E.g. if a ServiceUnavailable error is returned.
tests/unit/test_session.py
Outdated
| ("x-goog-spanner-route-to-leader", "true"), | ||
| ( | ||
| "x-goog-spanner-request-id", | ||
| f"1.{REQ_RAND_PROCESS_ID}.{database.NTH_CLIENT.value}.1.3.2", |
There was a problem hiding this comment.
Same here as for the BeginTransaction RPC: Transaction retries should not increase the attempt count. Only retries of a single RPC due to UNAVAILABLE errors (and other retryable error codes).
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
f8e0717 to
7fc3f3f
Compare
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
07a00f9 to
70eeaef
Compare
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
70eeaef to
227b93a
Compare
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
kokoro:force-run
aakashanandg
pushed a commit
to aakashanandg/python-spanner
that referenced
this pull request
Jan 2, 2025
…1275) * feat(x-goog-spanner-request-id): introduce AtomicCounter This change introduces AtomicCounter, a concurrency/thread-safe counter do deal with the multi-threaded nature of variables. It permits operations: * atomic_counter += 1 * value = atomic_counter + 1 * atomic_counter.value that'll be paramount to bringing in the logic for x-goog-spanner-request-id in much reduced changelists. Updates googleapis#1261 Carved out from PR googleapis#1264 * Tests for with_request_id * chore: remove sleep * chore: remove unused import --------- Co-authored-by: Knut Olav Løite <[email protected]>
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
651018b to
9d9a9fd
Compare
|
Kindly help me take another pass @olavloite. Thank you and happy New Year to you! |
olavloite
added
the
kokoro:force-run
yoshi-kokoro
removed
the
kokoro:force-run
…propagation Generates a request_id that is then injected inside metadata that's sent over to the Cloud Spanner backend. Officially inject the first set of x-goog-spanner-request-id values into header metadata Add request-id interceptor to use in asserting tests Wrap Snapshot methods with x-goog-request-id metadata injector Setup scaffolding for XGoogRequestIdHeader checks Wire up XGoogSpannerRequestIdInterceptor for TestDatabase checks Inject header in more Session using spots plus more tests Base for tests with retries on abort More plumbing for Transaction and Database Update unit tests for Transaction Wrap more in Transaction + update tests Update tests Plumb in more tests Update TestDatabase Fixes googleapis#1261
…ctory This commit contains a couple of changes: 1. Moves the request-ID tests using the mock server to the mockserver tests directory. 2. Adds tests for retries of RPCs. These currently fail, as the request ID is not updated correctly when a retry is executed for a unary RPC. Also, the retry test for streaming RPCs fails, but this is due to an existing bug in the client lib.
… assuming idempotency with headers too
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
4a6657e to
4d13c9b
Compare
…attempts per retry This monkey patches SpannerClient methods to have an interceptor that increases the attempts per retry. The prelude though is that any callers to it must pass in the attempt value 0 so that each pass through will correctly increase the attempt field's value.
odeke-em
force-pushed
the
x-goog-spanner-request-id
branch
from
3c82d4e to
f92c51d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements x-goog-spanner-request-id propagation for end-to-end debugging.
Fixes #1261