Skip to content

(fix) database is locked during remove #828

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

Merged
merged 1 commit into from
Nov 17, 2021
Merged

(fix) database is locked during remove #828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions pkg/sqlite/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,7 @@ func (s *sqlLoader) rmStrandedDeprecated(tx *sql.Tx) error {
if err != nil {
return err
}
defer rows.Close()
knownPackages := map[string]struct{}{}
for rows.Next() {
var pkg sql.NullString
Expand All @@ -1613,14 +1614,15 @@ func (s *sqlLoader) rmStrandedDeprecated(tx *sql.Tx) error {
}

packagePropertiesQuery := `select distinct operatorbundle_name, value from properties where type = ?`
rows, err = s.db.Query(packagePropertiesQuery, registry.PackageType)
pRows, err := tx.Query(packagePropertiesQuery, registry.PackageType)
Copy link
Member Author

@gallettilance gallettilance Nov 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewers: this is technically the root cause for this particular bug. Everything else seemed like good changes to make at the same time to prevent future such errors.

if err != nil {
return err
}
defer pRows.Close()

for rows.Next() {
for pRows.Next() {
var bundle, value sql.NullString
if err := rows.Scan(&bundle, &value); err != nil {
if err := pRows.Scan(&bundle, &value); err != nil {
return err
}

Expand Down Expand Up @@ -1764,10 +1766,11 @@ func (s sqlLoader) RemoveOverwrittenChannelHead(pkg, bundle string) error {
AND channel_entry.operatorbundle_name = ?
LIMIT 1`

rows, err := s.db.QueryContext(context.TODO(), getBundlesThatReplaceHeadQuery, pkg, bundle)
rows, err := tx.QueryContext(context.TODO(), getBundlesThatReplaceHeadQuery, pkg, bundle)
if err != nil {
return err
}
defer rows.Close()
if rows != nil {
for rows.Next() {
var replaces, channel sql.NullString
Expand All @@ -1793,17 +1796,17 @@ func (s sqlLoader) RemoveOverwrittenChannelHead(pkg, bundle string) error {
GROUP BY channel_name
`

rows, err = s.db.QueryContext(context.TODO(), getReplacingBundlesQuery, pkg, bundle)
pRows, err := tx.QueryContext(context.TODO(), getReplacingBundlesQuery, pkg, bundle)
if err != nil {
return err
}
defer rows.Close()
defer pRows.Close()

channelHeadUpdateQuery := `UPDATE channel SET head_operatorbundle_name = ? WHERE package_name = ? AND name = ? AND head_operatorbundle_name = ?`
for rows.Next() {
for pRows.Next() {
var replaces, channel sql.NullString
var depth sql.NullInt64
if err := rows.Scan(&replaces, &channel, &depth); err != nil {
if err := pRows.Scan(&replaces, &channel, &depth); err != nil {
return err
}

Expand Down