fix: data race issues with api.Server (backport #11724) (#11748)

This commit is contained in:
mergify[bot] 2022-04-25 10:41:34 -04:00 committed by GitHub
parent 3911f5251c
commit e9ba141d3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions

View File

@ -37,6 +37,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
## [Unreleased]
### Bug Fixes
* [\#11724](https://github.com/cosmos/cosmos-sdk/pull/11724) Fix data race issues with `api.Server`.
### Improvements
* [\#11693](https://github.com/cosmos/cosmos-sdk/pull/11693) Add validation for gentx cmd.

View File

@ -5,6 +5,7 @@ import (
"net"
"net/http"
"strings"
"sync"
"time"
"github.com/gogo/gateway"
@ -30,8 +31,13 @@ type Server struct {
GRPCGatewayRouter *runtime.ServeMux
ClientCtx client.Context
logger log.Logger
metrics *telemetry.Metrics
logger log.Logger
metrics *telemetry.Metrics
// Start() is blocking and generally called from a separate goroutine.
// Close() can be called asynchronously and access shared memory
// via the listener. Therefore, we sync access to Start and Close with
// this mutex to avoid data races.
mtx sync.Mutex
listener net.Listener
}
@ -83,9 +89,11 @@ func New(clientCtx client.Context, logger log.Logger) *Server {
// and are delegated to the Tendermint JSON RPC server. The process is
// non-blocking, so an external signal handler must be used.
func (s *Server) Start(cfg config.Config) error {
s.mtx.Lock()
if cfg.Telemetry.Enabled {
m, err := telemetry.New(cfg.Telemetry)
if err != nil {
s.mtx.Unlock()
return err
}
@ -101,6 +109,7 @@ func (s *Server) Start(cfg config.Config) error {
listener, err := tmrpcserver.Listen(cfg.API.Address, tmCfg)
if err != nil {
s.mtx.Unlock()
return err
}
@ -111,15 +120,19 @@ func (s *Server) Start(cfg config.Config) error {
if cfg.API.EnableUnsafeCORS {
allowAllCORS := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"}))
s.mtx.Unlock()
return tmrpcserver.Serve(s.listener, allowAllCORS(h), s.logger, tmCfg)
}
s.logger.Info("starting API server...")
s.mtx.Unlock()
return tmrpcserver.Serve(s.listener, s.Router, s.logger, tmCfg)
}
// Close closes the API server.
func (s *Server) Close() error {
s.mtx.Lock()
defer s.mtx.Unlock()
return s.listener.Close()
}