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.

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

Jump to bottom

core/services/ocr2/plugins/ocr2keeper/evmregister/v21/upkeepstate: use sqlutil instead of pg.QOpts #12806

Merged
merged 1 commit into from
Apr 15, 2024
Merged

core/services/ocr2/plugins/ocr2keeper/evmregister/v21/upkeepstate: use sqlutil instead of pg.QOpts #12806

merged 1 commit into from
Apr 15, 2024

Conversation

jmank88
Copy link
Contributor

@jmank88 jmank88 commented Apr 13, 2024

@github-actions GitHub Actions
Copy link
Contributor

I see you updated files related to core. Please run pnpm changeset in the root directory to add a changeset as well as in the text include at least one of the following tags:

#nops : For any feature that is NOP facing and needs to be in the official Release Notes for the release.
#added : For any new functionality added.
#changed : For any change to the existing functionality. 
#removed : For any functionality/config that is removed.
#updated : For any functionality that is updated.
#deprecation_notice : For any upcoming deprecation functionality.
#breaking_change : For any functionality that requires manual action for the node to boot.
#db_update : For any feature that introduces updates to database schema.
#wip : For any change that is not ready yet and external communication about it should be held off till it is feature complete.
#bugfix - For bug fixes.
#internal - For changesets that need to be excluded from the final changelog.

@jmank88 jmank88 force-pushed the BCF-2978-rm-qopts-ocr2keeper branch from f47ba21 to cdcb4b1 Compare April 13, 2024 01:10
@jmank88 jmank88 marked this pull request as ready for review April 13, 2024 01:10
@jmank88 jmank88 requested review from a team as code owners April 13, 2024 01:10
@jmank88 jmank88 enabled auto-merge April 13, 2024 01:45
@jmank88 jmank88 mentioned this pull request Apr 13, 2024
Merged
1 task
@jmank88 jmank88 force-pushed the BCF-2978-rm-qopts-ocr2keeper branch from cdcb4b1 to f18cdc7 Compare April 13, 2024 02:54
@cl-sonarqube-production
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

dimriou
dimriou reviewed Apr 15, 2024
View reviewed changes
core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store.go
@@ -320,7 +320,9 @@ func (u *upkeepStateStore) cleanup(ctx context.Context) error {
func (u *upkeepStateStore) cleanDB(ctx context.Context) error {
tm := time.Now().Add(-1 * u.retention)

return u.orm.DeleteExpired(tm, pg.WithParentCtx(ctx), pg.WithLongQueryTimeout())
ctx, cancel := context.WithTimeout(sqlutil.WithoutDefaultTimeout(ctx), time.Minute)
Copy link
Collaborator

@dimriou dimriou Apr 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Is it ok to remove the timeout completely?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How come? I think these are still necessary to replace the default timeout which may be too short.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Just wondering if it's ok to never timeout, compared to what we have now. I don't have a strong preference, just noticed the difference.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change is preserving the original "long" timeout of 1m.

@jmank88 jmank88 added this pull request to the merge queue Apr 15, 2024
Merged via the queue into develop with commit 9964dc8 Apr 15, 2024
105 checks passed
@jmank88 jmank88 deleted the BCF-2978-rm-qopts-ocr2keeper branch April 15, 2024 11:49
This was referenced Apr 15, 2024
Closed
Closed
Closed
Closed
Closed
Closed
This was referenced Apr 24, 2024
Closed
Closed
Closed
This was referenced Apr 25, 2024
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dimriou dimriou dimriou approved these changes

@DylanTinianov DylanTinianov Awaiting requested review from DylanTinianov

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jmank88 @dimriou