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.

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

sqlite: do not Ping() after connecting #17953

Merged
merged 1 commit into from
Mar 28, 2023

Conversation

vrothberg
Copy link
Member

Ping() requires the DB lock, so we had to move it into a transaction to fix #17859. Since we try to access the DB directly afterwards, I prefer to let that fail instead of paying the cost of a transaction which would lock the DB for all processes.

[NO NEW TESTS NEEDED] as it's a hard to reproduce race.

Fixes: #17859

Does this PR introduce a user-facing change?

None

@mheon @baude @giuseppe @edsantiago PTAL

`Ping()` requires the DB lock, so we had to move it into a transaction
to fix containers#17859. Since we try to access the DB directly afterwards, I
prefer to let that fail instead of paying the cost of a transaction
which would lock the DB for _all_ processes.

[NO NEW TESTS NEEDED] as it's a hard to reproduce race.

Fixes: containers#17859
Signed-off-by: Valentin Rothberg <[email protected]>
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none labels Mar 28, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 28, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vrothberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 28, 2023
@vrothberg vrothberg marked this pull request as ready for review March 28, 2023 10:25
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 28, 2023
@edsantiago
Copy link
Member

None of the Usual Suspect strings appear in the test logs: 'is locked|unique constraint|constraint fail|config row|adding db|dbconfig.id'

@mheon
Copy link
Member

mheon commented Mar 28, 2023

Sure, LGTM, this was a lot more useful when it wasn't immediately followed by massive CREATE TABLE blocks, so there's no reason to keep it around.

@vrothberg
Copy link
Member Author

Nice, let's get that in to scratch that flake off our list.

@baude
Copy link
Member

baude commented Mar 28, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2023
@openshift-merge-robot openshift-merge-robot merged commit 62321a2 into containers:main Mar 28, 2023
@vrothberg vrothberg deleted the fix-17859 branch March 29, 2023 07:22
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 4, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sqlite: database is locked
5 participants