fixing multinode state transition logic by register polling subscription in rpc client #14534
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
huangzhen1997
requested review from
reductionista
and removed request for
a team
huangzhen1997
changed the title
.changeset/moody-rules-agree.md
Outdated
| "chainlink": patch | ||
| --- | ||
|
|
||
| - register polling subscription logic in rpc client so when node unhealthy new susbcription will be used |
There was a problem hiding this comment.
Suggested change
| - register polling subscription logic in rpc client so when node unhealthy new susbcription will be used | |
| - register polling subscription to avoid subscription leaking when rpc client gets closed. |
| require.NoError(t, rpc.Dial(ctx)) | ||
|
|
||
| ch := make(chan *evmtypes.Head) | ||
| _, err := rpc.SubscribeNewHead(tests.Context(t), ch) |
There was a problem hiding this comment.
Could you check that the returned subscription is closed?
| @@ -6,6 +6,7 @@ import ( | |||
| "errors" | |||
| "fmt" | |||
| "math/big" | |||
| _ "net/http/pprof" | |||
| rpc.DisconnectAll() | ||
|
|
||
| // ensure sub is closed | ||
| _, ok := <-errCh |
There was a problem hiding this comment.
Could you use
select {
<-errCh: // ok
default: fail
}
To return more explicit error instead of tests timeout
dhaidashenko
requested changes
Sep 27, 2024
huangzhen1997
commented
Sep 27, 2024
| @@ -129,7 +129,8 @@ type rpcClient struct { | |||
| ws rawclient | |||
| http *rawclient | |||
|
|
|||
| stateMu sync.RWMutex // protects state* fields | |||
| stateMu sync.RWMutex // protects state* fields | |||
| subsSliceMu sync.RWMutex // protects subscription slice | |||
There was a problem hiding this comment.
a deadlock was caught by my new unit tests, and this fixes it.
|
amit-momin
approved these changes
Sep 27, 2024
reductionista
deleted the
BCFR-946/register-polling-subscription-in-rpc-client
branch
AnieeG
pushed a commit
that referenced
this pull request
Sep 30, 2024
…ion in rpc client (#14534) * polling subscription to be registered * adding changeset * fix Subscribe new head * add test * update changeset * fix lint * fix deadlock and add unit test for http polling sub * update changeset * adding sub closed check and remove import * add unit test coverage for http polling subscribeToHeads * update test * address comments part 1 * clean * part 2 * fix lint * fix lint
This was referenced Oct 8, 2024
matYang
pushed a commit
to smartcontractkit/ccip
that referenced
this pull request
Nov 14, 2024
Optional WS URL for RPCs to unblock new chain integration. Charry-picks from: smartcontractkit/chainlink#14354 smartcontractkit/chainlink#14373 smartcontractkit/chainlink#14534 smartcontractkit/chainlink#14364 smartcontractkit/chainlink#14929 --------- Co-authored-by: Joe Huang <joe.huang@smartcontract.com>
matYang
added a commit
to smartcontractkit/ccip
that referenced
this pull request
Nov 18, 2024
Optional WS URL for RPCs to unblock new chain integration. Charry-picks from: smartcontractkit/chainlink#14534 smartcontractkit/chainlink#14364 smartcontractkit/chainlink#14929 --------- Co-authored-by: Joe Huang <joe.huang@smartcontract.com> Co-authored-by: Adam Hamrick <adam.hamrick@smartcontract.com> Co-authored-by: Chunkai Yang <matYang@users.noreply.github.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.
Description
SubscribeToFinalizedHeads and SubscribeToHeads won’t abort polling subscription after Close
It could cause clients like HeadTracker to keep using subscriptions to unhealthy RPC despite MultiNode's transitioning to an unhealthy state.
DoD: polling subscription must be registered
Also added a patch for subscribeNewHead when polling is enabled.
Tickets:
BCFR-946(https://smartcontract-it.atlassian.net/browse/BCFR-946