Consolidate crdb tx retry and reset #472
Merged
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
Member
samkim
commented
Mar 9, 2022
•
samkim
commented
- Remove crdb tx savepoint usage
- Update remaining crdb tx to use datatstore execute
github-actions
bot
added
area/datastore
josephschorr
reviewed
Mar 9, 2022
samkim
changed the title
samkim
force-pushed
the
tx-retry-err
branch
2 times, most recently
from
eab0307 to
2e67d2b
Compare
internal/datastore/crdb/namespace.go
Outdated
| var err error | ||
| var config *core.NamespaceDefinition | ||
| var timestamp time.Time | ||
| err = cds.execute(ctx, cds.conn, pgx.TxOptions{AccessMode: pgx.ReadOnly}, func(tx pgx.Tx) error { |
There was a problem hiding this comment.
So this wraps the reset handling for ReadNamespace now too?
internal/datastore/crdb/tx.go
Outdated
| @@ -78,10 +51,9 @@ func executeWithMaxRetries(max int) executeTxRetryFunc { | |||
|
|
|||
| // executeWithResets executes transactionFn and resets the tx when ambiguous crdb errors are encountered. | |||
| func executeWithResets(ctx context.Context, conn conn, txOptions pgx.TxOptions, fn transactionFn, maxRetries int) (err error) { | |||
| var retries, resets int | |||
| var retries int | |||
There was a problem hiding this comment.
Shouldn't this be resets now?
There was a problem hiding this comment.
Kept it as retries because the config is named retries so essentially making the resetting an internal implementation detail. I don't feel strongly about it so can change the var name and metric name to use reset.
There was a problem hiding this comment.
Whichever, they just should match
samkim
force-pushed
the
tx-retry-err
branch
2 times, most recently
from
9eb9d4f to
d70383a
Compare
ecordell
reviewed
Mar 28, 2022
internal/datastore/crdb/tx.go
Outdated
| } | ||
|
|
||
| // resetExecution attempts to rollback the given tx, begins a new tx with a new connection, and creates a savepoint. | ||
| // resetExecution attempts to rollback the given tx and begins a new tx with a new connection. | ||
| func resetExecution(ctx context.Context, conn conn, tx pgx.Tx, txOptions pgx.TxOptions) (newTx pgx.Tx, err error) { | ||
| log.Info().Msg("attempting to initialize new tx") |
There was a problem hiding this comment.
I know this here before, but now that it's getting called on revision and namespace reads, shouldn't this be a higher log level than Info?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.