Remove built in capabilities from local registry on Close #15471
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
AER Report: CI Core ran successfully ✅AER Report: Operator UI CI ran successfully ✅ |
justinkaseman
force-pushed
the
CAPPL-235
branch
5 times, most recently
from
0199240 to
5042fe0
Compare
justinkaseman
force-pushed
the
CAPPL-235
branch
from
5042fe0 to
95178c1
Compare
core/capabilities/compute/compute.go
Outdated
| @@ -276,7 +276,7 @@ func (c *Compute) Close() error { | |||
| c.modules.close() | |||
| close(c.stopCh) | |||
| c.wg.Wait() | |||
| return nil | |||
| return c.registry.Remove(context.TODO(), CapabilityIDCompute) | |||
There was a problem hiding this comment.
See my comment in the capabilities PR about doing this inside the standard capability job delegate, in one of the hooks.
jmank88
reviewed
Dec 5, 2024
| @@ -57,6 +57,10 @@ func (c *Capability) Start(ctx context.Context) error { | |||
| } | |||
|
|
|||
| func (c *Capability) Close() error { | |||
| err := c.registry.Remove(context.TODO(), c.capabilityInfo.ID) | |||
There was a problem hiding this comment.
For Close() methods, we typically use a sanity check like 1s so that a service cannot block shutdown or whatever else:
Suggested change
| err := c.registry.Remove(context.TODO(), c.capabilityInfo.ID) | |
| ctx, cancel := context.WithTimeout(context.Background(), time.Second) | |
| defer cancel() | |
| err := c.registry.Remove(ctx, c.capabilityInfo.ID) |
There was a problem hiding this comment.
Ah, good tip. Added that!
ettec
reviewed
Dec 5, 2024
ettec
approved these changes
Dec 5, 2024
patrickhuie19
approved these changes
Dec 5, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
jhweintraub
pushed a commit
that referenced
this pull request
Dec 6, 2024
* Remove built in capabilities from local registry on Close * Add 1 sec timeout to close * Return error instead of logging
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.
Description
Bumps chainlink-common
Introduces a change, where on Capability service closing, it will clean itself up from the local registry.
Affects non-standard capabilities:
Caveats
Blocked by smartcontractkit/chainlink-common#953 which updates common types