Skip to content
This repository was archived by the owner on Apr 4, 2024. It is now read-only.

fix newPendingTransactions subscription deadlock issue #933

Merged
fedekunze merged 4 commits into from
Feb 10, 2022
Merged

fix newPendingTransactions subscription deadlock issue #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a392f38
fix newPendingTransactions subscription deadlock issue
crypto-facs Feb 9, 2022
f801fa6
updated changelog
crypto-facs Feb 9, 2022
cd33660
updated changelog
crypto-facs Feb 10, 2022
730f185
add comment
crypto-facs Feb 10, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (evm) [tharsis#871](https://github.com/tharsis/ethermint/pull/871) Set correct nonce in `EthCall` and `EstimateGas` grpc query.
* (rpc) [tharsis#878](https://github.com/tharsis/ethermint/pull/878) Workaround to make GetBlock RPC api report correct block gas used.
* (rpc) [tharsis#900](https://github.com/tharsis/ethermint/pull/900) newPendingTransactions filter return ethereum tx hash.
* (rpc) [tharsis#933](https://github.com/tharsis/ethermint/pull/933) Fix newPendingTransactions subscription deadlock when a Websocket client exits without unsubscribing and the node errors.

## [v0.9.0] - 2021-12-01

Expand Down
10 changes: 9 additions & 1 deletion rpc/websockets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,16 @@ func (api *pubSubAPI) subscribePendingTransactions(wsConn *wsConn) (rpc.ID, erro
api.logger.Debug("error writing header, will drop peer", "error", err.Error())

try(func() {
// Release the initial read lock in .RUnlock() before
// invoking .Lock() to avoid the deadlock in
// https://github.com/tharsis/ethermint/issues/821#issuecomment-1033959984
// and as documented at https://pkg.go.dev/sync#RWMutex
api.filtersMu.RUnlock()
Comment thread
crypto-facs marked this conversation as resolved.
api.filtersMu.Lock()
defer api.filtersMu.Unlock()
defer func() {
api.filtersMu.Unlock()
api.filtersMu.RLock()
}()

if err != websocket.ErrCloseSent {
_ = wsSub.wsConn.Close()
Expand Down