core/services: fix ocrWrapper saveError contexts #13139
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
jmank88
force-pushed
the
BCF-3221-ocr-wrapper-ctx
branch
from
2a568c3
to
f5d8bee
Compare
jmank88
force-pushed
the
BCF-3221-ocr-wrapper-ctx
branch
from
f5d8bee
to
25bbde0
Compare
ilija42
previously approved these changes
May 8, 2024
| OffchainConfigDigester: configProvider.OffchainConfigDigester(), | ||
| } | ||
| lggr.Debugw("Launching new bootstrap node", "args", bootstrapNodeArgs) | ||
| bootstrapper, err := ocr.NewBootstrapper(bootstrapNodeArgs) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "error calling NewBootstrapNode") | ||
| } | ||
| return []job.ServiceCtx{configProvider, job.NewServiceAdapter(bootstrapper)}, nil | ||
| return []job.ServiceCtx{configProvider, ocrLogger, job.NewServiceAdapter(bootstrapper)}, nil |
There was a problem hiding this comment.
is ocrLogger to be wired through in bootstrapper as well as on its own?
There was a problem hiding this comment.
The bootstrapper depends on it, but it doesn't understand that it needs to be closed, so it is not closed by the ServiceAdapter.Close() call.
| @@ -163,22 +162,23 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) (services [] | |||
| "ContractTransmitterTransmitTimeout", lc.ContractTransmitterTransmitTimeout, | |||
| "DatabaseTimeout", lc.DatabaseTimeout, | |||
| ) | |||
| ocrLogger := ocrcommon.NewOCRWrapper(lggr.Named("OCRBootstrap"), d.ocr2Cfg.TraceLogging(), func(ctx context.Context, msg string) { | |||
There was a problem hiding this comment.
For my own understanding: the benefit of this is that now consumers of ocrLogger will provide their own context to saveError rather than inheriting it from the delegate?
There was a problem hiding this comment.
Yes, it is tied to the lifecyle of the job now. Inheriting from the delegate method was the real problem. My first hack added a StopChan backed Close() method to the Delegates instead. That works but ties it to the lifecyle of the delegate itself, which is not cancelled until shutdown. This new approach manages the lifecycle appropriately, at the cost of a little code duplication where we used to be able to share.
jmank88
force-pushed
the
BCF-3221-ocr-wrapper-ctx
branch
from
25bbde0
to
c0d8075
Compare
|
patrickhuie19
approved these changes
May 8, 2024
jmank88
requested review from
bolekk,
reductionista,
samsondav,
EasterTheBunny and
a team
snehaagni
approved these changes
May 8, 2024
krehermann
approved these changes
May 8, 2024
jmank88
added a commit
that referenced
this pull request
May 8, 2024
(cherry picked from commit 15fab1d)
This was referenced May 9, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jun 6, 2024
* Bump version and update CHANGELOG for core v2.12.0 Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> * core/services: fix ocrWrapper saveError contexts (#13139) (cherry picked from commit 15fab1d) * changed spammy error log to debug (#13153) (cherry picked from commit 3502176) * Updating changelog for 2.12.0 with cherry pick fix Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> * BCF-3225 - Implement forwarder fallback if forwarder not present as a transmitter on OCR2 aggregator (#13221) * Implement forwarder OCR2 fallback if fwd not present as a transmitter * Add changeset * Fix panic on mercury server error (#13231) (#13256) * Fix changelog * Fixed CPU usage issues caused by inefficiencies in HeadTracker (#13230) * Fixed CPU usage issues caused by inefficiencies in HeadTracker * added comments * revert heads back to the fix (cherry picked from commit 6f1ebca) * Update CHANGELOG for 2.12.0 bugfixes Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> * Decouple ChainType from config string [SHIP-2001] (#13272) * fix: Decouple ChainType from config string * fix: receiver name and failing test * test: enhance config test to test for xdai specifically * refactor: directly unmarshal into ChainType * fix: validation * test: fix TestDoc/EVM * test: add xdai to warnings.xtar * Index only the fifth word to reduce the db size overhead (#13315) Co-authored-by: Domino Valdano <domino.valdano@smartcontract.com> * Add special transmitter for OCR2 feeds (#13323) * Add special transmitter for OCR2 feeds * Add ocr2FeedsTransmitter FromAddress() * Cherry-pick some forwarders context changes from (#13171) * Improve ocr2FeedsTransmitter FromAddress() fallback (#13343) * Improve ocr2FeedsTransmitter FromAddress() fallback * Fix forwarders test error assert * Update 2.12.0 Changelog with bugfixes Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> * core/services/pipeline: bridge task must continue after cancellation * core/services/pipeline: use request context for deletion (#13404) * core/services/pipeline: hide deadline from monitor * Finalize date on changelog for 2.12.0 Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> * Fix merge conflicts * Remove `overtimeThresholds` * Return to old version of pipeline-runner --------- Signed-off-by: Sneha Agnihotri <sneha.agnihotri@smartcontract.com> Co-authored-by: Jordan Krage <jmank88@gmail.com> Co-authored-by: Patrick <patrick.huie@smartcontract.com> Co-authored-by: ilija42 <57732589+ilija42@users.noreply.github.com> Co-authored-by: Sam <samsondav@protonmail.com> Co-authored-by: Dmytro Haidashenko <34754799+dhaidashenko@users.noreply.github.com> Co-authored-by: Friedemann Fürst <friedemann.fuerst@smartcontract.com> Co-authored-by: Mateusz Sekara <mateusz.sekara@smartcontract.com> Co-authored-by: Domino Valdano <domino.valdano@smartcontract.com> Co-authored-by: ilija <pavlovicilija42@gmail.com> Co-authored-by: frank zhu <fr@nkzhu.com> Co-authored-by: george-dorin <george.dorin@smartcontract.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.
https://smartcontract-it.atlassian.net/browse/BCF-3221
The
saveErrorfuncs passed toNewOCRWrapperwere inheriting out-of-scopecontext.Contexts. This PR updates them to cancel onClose()instead.