SQLStore: Fix SQLite error propagation if query retries are disabled #64904
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
papagian
added
type/bug
no-backport
papagian
requested review from
sakjur,
zserge and
suntala
and removed request for
a team
papagian
added
add to changelog
and removed
no-changelog
zserge
approved these changes
Mar 17, 2023
suntala
reviewed
Mar 17, 2023
| i := 0 | ||
| callback := func(sess *DBSession) error { | ||
| i++ | ||
| return sqlite3.Error{Code: sqlite3.ErrBusy} |
There was a problem hiding this comment.
Should we also have a test case for the error being sqlite3.ErrLocked?
suntala
reviewed
Mar 17, 2023
| @@ -44,6 +44,19 @@ func TestRetryingDisabled(t *testing.T) { | |||
| require.Equal(t, 1, i) | |||
| }) | |||
|
|
|||
| t.Run(fmt.Sprintf("%s should return the sqlite3.Error immediately", name), func(t *testing.T) { | |||
There was a problem hiding this comment.
Nit: Might be nice to change sqlite3.Error to sqlite3.ErrBusy/sqlite3.ErrLocked depending on the test case.
papagian
added
backport v9.3.x
backport v9.4.x
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-64904-to-v9.3.x origin/v9.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 41843464d17df3800df447af4eec1ebfcc54d42b
# Push it to GitHub
git push --set-upstream origin backport-64904-to-v9.3.x
git switch main
# Remove the local backport branch
git branch -D backport-64904-to-v9.3.xThen, create a pull request where the |
grafanabot
added
the
backport-failed
|
the bug was introduced in |
papagian
added a commit
that referenced
this pull request
Mar 17, 2023
…disabled (#64948) SQLStore: Fix SQLite error propagation if query retries are disabled (#64904) * SQLStore: Add test when query retrying is disabled * Fix condition * Add test cases for sqlite3.ErrLocked (cherry picked from commit 4184346) Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
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.
What is this feature?
The following condition (introduced in #58559) used to fail if the query retries are disabled (equal to zero) (default behaviour):
grafana/pkg/services/sqlstore/session.go
Line 98 in 998b035
As a result due to retryer behaviour:
grafana/pkg/util/retryer/retryer.go
Lines 43 to 45 in 998b035
the
sqlite3.ErrLockedandsqlite3.ErrBusywere not propagatedThis fix changes the above condition to check for greater or equal instead
Why do we need this feature?
[Add a description of the problem the feature is trying to solve.]
Who is this feature for?
[Add information on what kind of user the feature is for.]
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer: