mirror of
https://github.com/fluencelabs/tendermint
synced 2025-04-25 06:42:16 +00:00
* limit number of /subscribe clients and queries per client Add the following config variables (under [rpc] section): * max_subscription_clients * max_subscriptions_per_client * timeout_broadcast_tx_commit Fixes #2826 new HTTPClient interface for subscriptions finalize HTTPClient events interface remove EventSubscriber fix data race ``` WARNING: DATA RACE Read at 0x00c000a36060 by goroutine 129: github.com/tendermint/tendermint/rpc/client.(*Local).Subscribe.func1() /go/src/github.com/tendermint/tendermint/rpc/client/localclient.go:168 +0x1f0 Previous write at 0x00c000a36060 by goroutine 132: github.com/tendermint/tendermint/rpc/client.(*Local).Subscribe() /go/src/github.com/tendermint/tendermint/rpc/client/localclient.go:191 +0x4e0 github.com/tendermint/tendermint/rpc/client.WaitForOneEvent() /go/src/github.com/tendermint/tendermint/rpc/client/helpers.go:64 +0x178 github.com/tendermint/tendermint/rpc/client_test.TestTxEventsSentWithBroadcastTxSync.func1() /go/src/github.com/tendermint/tendermint/rpc/client/event_test.go:139 +0x298 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 Goroutine 129 (running) created at: github.com/tendermint/tendermint/rpc/client.(*Local).Subscribe() /go/src/github.com/tendermint/tendermint/rpc/client/localclient.go:164 +0x4b7 github.com/tendermint/tendermint/rpc/client.WaitForOneEvent() /go/src/github.com/tendermint/tendermint/rpc/client/helpers.go:64 +0x178 github.com/tendermint/tendermint/rpc/client_test.TestTxEventsSentWithBroadcastTxSync.func1() /go/src/github.com/tendermint/tendermint/rpc/client/event_test.go:139 +0x298 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 Goroutine 132 (running) created at: testing.(*T).Run() /usr/local/go/src/testing/testing.go:878 +0x659 github.com/tendermint/tendermint/rpc/client_test.TestTxEventsSentWithBroadcastTxSync() /go/src/github.com/tendermint/tendermint/rpc/client/event_test.go:119 +0x186 testing.tRunner() /usr/local/go/src/testing/testing.go:827 +0x162 ================== ``` lite client works (tested manually) godoc comments httpclient: do not close the out channel use TimeoutBroadcastTxCommit no timeout for unsubscribe but 1s Local (5s HTTP) timeout for resubscribe format code change Subscribe#out cap to 1 and replace config vars with RPCConfig TimeoutBroadcastTxCommit can't be greater than rpcserver.WriteTimeout rpc: Context as first parameter to all functions reformat code fixes after my own review fixes after Ethan's review add test stubs fix config.toml * fixes after manual testing - rpc: do not recommend to use BroadcastTxCommit because it's slow and wastes Tendermint resources (pubsub) - rpc: better error in Subscribe and BroadcastTxCommit - HTTPClient: do not resubscribe if err = ErrAlreadySubscribed * fixes after Ismail's review * Update rpc/grpc/grpc_test.go Co-Authored-By: melekes <anton.kalyaev@gmail.com>
176 lines
3.5 KiB
Go
176 lines
3.5 KiB
Go
package core
|
|
|
|
import (
|
|
cfg "github.com/tendermint/tendermint/config"
|
|
"github.com/tendermint/tendermint/consensus"
|
|
"github.com/tendermint/tendermint/crypto"
|
|
dbm "github.com/tendermint/tendermint/libs/db"
|
|
"github.com/tendermint/tendermint/libs/log"
|
|
mempl "github.com/tendermint/tendermint/mempool"
|
|
"github.com/tendermint/tendermint/p2p"
|
|
"github.com/tendermint/tendermint/proxy"
|
|
rpcserver "github.com/tendermint/tendermint/rpc/lib/server"
|
|
sm "github.com/tendermint/tendermint/state"
|
|
"github.com/tendermint/tendermint/state/txindex"
|
|
"github.com/tendermint/tendermint/types"
|
|
)
|
|
|
|
const (
|
|
// see README
|
|
defaultPerPage = 30
|
|
maxPerPage = 100
|
|
)
|
|
|
|
var subscribeTimeout = rpcserver.WriteTimeout / 2
|
|
|
|
//----------------------------------------------
|
|
// These interfaces are used by RPC and must be thread safe
|
|
|
|
type Consensus interface {
|
|
GetState() sm.State
|
|
GetValidators() (int64, []*types.Validator)
|
|
GetLastHeight() int64
|
|
GetRoundStateJSON() ([]byte, error)
|
|
GetRoundStateSimpleJSON() ([]byte, error)
|
|
}
|
|
|
|
type transport interface {
|
|
Listeners() []string
|
|
IsListening() bool
|
|
NodeInfo() p2p.NodeInfo
|
|
}
|
|
|
|
type peers interface {
|
|
DialPeersAsync(p2p.AddrBook, []string, bool) error
|
|
NumPeers() (outbound, inbound, dialig int)
|
|
Peers() p2p.IPeerSet
|
|
}
|
|
|
|
//----------------------------------------------
|
|
// These package level globals come with setters
|
|
// that are expected to be called only once, on startup
|
|
|
|
var (
|
|
// external, thread safe interfaces
|
|
proxyAppQuery proxy.AppConnQuery
|
|
|
|
// interfaces defined in types and above
|
|
stateDB dbm.DB
|
|
blockStore sm.BlockStore
|
|
evidencePool sm.EvidencePool
|
|
consensusState Consensus
|
|
p2pPeers peers
|
|
p2pTransport transport
|
|
|
|
// objects
|
|
pubKey crypto.PubKey
|
|
genDoc *types.GenesisDoc // cache the genesis structure
|
|
addrBook p2p.AddrBook
|
|
txIndexer txindex.TxIndexer
|
|
consensusReactor *consensus.ConsensusReactor
|
|
eventBus *types.EventBus // thread safe
|
|
mempool *mempl.Mempool
|
|
|
|
logger log.Logger
|
|
|
|
config cfg.RPCConfig
|
|
)
|
|
|
|
func SetStateDB(db dbm.DB) {
|
|
stateDB = db
|
|
}
|
|
|
|
func SetBlockStore(bs sm.BlockStore) {
|
|
blockStore = bs
|
|
}
|
|
|
|
func SetMempool(mem *mempl.Mempool) {
|
|
mempool = mem
|
|
}
|
|
|
|
func SetEvidencePool(evpool sm.EvidencePool) {
|
|
evidencePool = evpool
|
|
}
|
|
|
|
func SetConsensusState(cs Consensus) {
|
|
consensusState = cs
|
|
}
|
|
|
|
func SetP2PPeers(p peers) {
|
|
p2pPeers = p
|
|
}
|
|
|
|
func SetP2PTransport(t transport) {
|
|
p2pTransport = t
|
|
}
|
|
|
|
func SetPubKey(pk crypto.PubKey) {
|
|
pubKey = pk
|
|
}
|
|
|
|
func SetGenesisDoc(doc *types.GenesisDoc) {
|
|
genDoc = doc
|
|
}
|
|
|
|
func SetAddrBook(book p2p.AddrBook) {
|
|
addrBook = book
|
|
}
|
|
|
|
func SetProxyAppQuery(appConn proxy.AppConnQuery) {
|
|
proxyAppQuery = appConn
|
|
}
|
|
|
|
func SetTxIndexer(indexer txindex.TxIndexer) {
|
|
txIndexer = indexer
|
|
}
|
|
|
|
func SetConsensusReactor(conR *consensus.ConsensusReactor) {
|
|
consensusReactor = conR
|
|
}
|
|
|
|
func SetLogger(l log.Logger) {
|
|
logger = l
|
|
}
|
|
|
|
func SetEventBus(b *types.EventBus) {
|
|
eventBus = b
|
|
}
|
|
|
|
// SetConfig sets an RPCConfig.
|
|
func SetConfig(c cfg.RPCConfig) {
|
|
config = c
|
|
}
|
|
|
|
func validatePage(page, perPage, totalCount int) int {
|
|
if perPage < 1 {
|
|
return 1
|
|
}
|
|
|
|
pages := ((totalCount - 1) / perPage) + 1
|
|
if page < 1 {
|
|
page = 1
|
|
} else if page > pages {
|
|
page = pages
|
|
}
|
|
|
|
return page
|
|
}
|
|
|
|
func validatePerPage(perPage int) int {
|
|
if perPage < 1 {
|
|
return defaultPerPage
|
|
} else if perPage > maxPerPage {
|
|
return maxPerPage
|
|
}
|
|
return perPage
|
|
}
|
|
|
|
func validateSkipCount(page, perPage int) int {
|
|
skipCount := (page - 1) * perPage
|
|
if skipCount < 0 {
|
|
return 0
|
|
}
|
|
|
|
return skipCount
|
|
}
|