Skip to content

Commit

Permalink
fix: data race issues with api.Server (backport #11724) (#11749)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 25, 2022
1 parent 1fa9e5a commit 02becf9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Bug Fixes

* [\#11724](https://github.com/cosmos/cosmos-sdk/pull/11724) Fix data race issues with `api.Server`.
* [\#11354](https://github.com/cosmos/cosmos-sdk/pull/11355) Added missing pagination flag for `bank q total` query.
* [\#11197](https://github.com/cosmos/cosmos-sdk/pull/11197) Signing with multisig now works with multisig address which is not in the keyring.
* (makefile) [\#11285](https://github.com/cosmos/cosmos-sdk/pull/11285) Fix lint-fix make target.
Expand Down
17 changes: 15 additions & 2 deletions server/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"net"
"net/http"
"strings"
"sync"
"time"

"github.com/gogo/gateway"
Expand All @@ -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
}

Expand Down Expand Up @@ -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
}

Expand All @@ -101,6 +109,7 @@ func (s *Server) Start(cfg config.Config) error {

listener, err := tmrpcserver.Listen(cfg.API.Address, tmCfg.MaxOpenConnections)
if err != nil {
s.mtx.Unlock()
return err
}

Expand All @@ -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()
}

Expand Down

0 comments on commit 02becf9

Please sign in to comment.