* fix: start GRPCWebServer in goroutine (#9704)
so it don't block other code from executing.
Closes #9703
<!--
The default pull request template is for types feat, fix, or refactor.
For other templates, add one of the following parameters to the url:
- template=docs.md
- template=other.md
-->
## Description
<!-- Add a description of the changes that this PR introduces and the files that
are the most critical to review. -->
---
### Author Checklist
*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*
I have...
- [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] provided a link to the relevant issue or specification
- [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules)
- [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [ ] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed
### Reviewers Checklist
*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*
I have...
- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed state machine logic
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)
(cherry picked from commit d5674a5d3e
)
# Conflicts:
# CHANGELOG.md
* fix changelog
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
This commit is contained in:
parent
606d56e290
commit
0ab5726a7a
|
@ -35,6 +35,11 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [v0.43.0-rc2](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc2) - 2021-07-19
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* (server) [#9704](https://github.com/cosmos/cosmos-sdk/pull/9704) Start GRPCWebServer in goroutine, avoid blocking other services from starting.
|
||||||
|
|
||||||
## [v0.43.0-rc1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc1) - 2021-07-14
|
## [v0.43.0-rc1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc1) - 2021-07-14
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
package grpc
|
package grpc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/improbable-eng/grpc-web/go/grpcweb"
|
"github.com/improbable-eng/grpc-web/go/grpcweb"
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/server/config"
|
"github.com/cosmos/cosmos-sdk/server/config"
|
||||||
|
"github.com/cosmos/cosmos-sdk/server/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StartGRPCWeb starts a gRPC-Web server on the given address.
|
// StartGRPCWeb starts a gRPC-Web server on the given address.
|
||||||
|
@ -28,8 +31,18 @@ func StartGRPCWeb(grpcSrv *grpc.Server, config config.Config) (*http.Server, err
|
||||||
Addr: config.GRPCWeb.Address,
|
Addr: config.GRPCWeb.Address,
|
||||||
Handler: http.HandlerFunc(handler),
|
Handler: http.HandlerFunc(handler),
|
||||||
}
|
}
|
||||||
if err := grpcWebSrv.ListenAndServe(); err != nil {
|
|
||||||
|
errCh := make(chan error)
|
||||||
|
go func() {
|
||||||
|
if err := grpcWebSrv.ListenAndServe(); err != nil {
|
||||||
|
errCh <- fmt.Errorf("[grpc] failed to serve: %w", err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case err := <-errCh:
|
||||||
return nil, err
|
return nil, err
|
||||||
|
case <-time.After(types.ServerStartTime): // assume server started successfully
|
||||||
|
return grpcWebSrv, nil
|
||||||
}
|
}
|
||||||
return grpcWebSrv, nil
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ func StartGRPCServer(clientCtx client.Context, app types.Application, address st
|
||||||
select {
|
select {
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
return nil, err
|
return nil, err
|
||||||
case <-time.After(5 * time.Second): // assume server started successfully
|
case <-time.After(types.ServerStartTime): // assume server started successfully
|
||||||
return grpcSrv, nil
|
return grpcSrv, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -314,7 +314,7 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App
|
||||||
select {
|
select {
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
return err
|
return err
|
||||||
case <-time.After(5 * time.Second): // assume server started successfully
|
case <-time.After(types.ServerStartTime): // assume server started successfully
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -368,7 +368,7 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App
|
||||||
select {
|
select {
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
return err
|
return err
|
||||||
case <-time.After(5 * time.Second): // assume server started successfully
|
case <-time.After(types.ServerStartTime): // assume server started successfully
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ package types
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
"io"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gogo/protobuf/grpc"
|
"github.com/gogo/protobuf/grpc"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
@ -16,6 +17,10 @@ import (
|
||||||
"github.com/cosmos/cosmos-sdk/server/config"
|
"github.com/cosmos/cosmos-sdk/server/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ServerStartTime defines the time duration that the server need to stay running after startup
|
||||||
|
// for the startup be considered successful
|
||||||
|
const ServerStartTime = 5 * time.Second
|
||||||
|
|
||||||
type (
|
type (
|
||||||
// AppOptions defines an interface that is passed into an application
|
// AppOptions defines an interface that is passed into an application
|
||||||
// constructor, typically used to set BaseApp options that are either supplied
|
// constructor, typically used to set BaseApp options that are either supplied
|
||||||
|
|
|
@ -16,6 +16,7 @@ import (
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/server/api"
|
"github.com/cosmos/cosmos-sdk/server/api"
|
||||||
servergrpc "github.com/cosmos/cosmos-sdk/server/grpc"
|
servergrpc "github.com/cosmos/cosmos-sdk/server/grpc"
|
||||||
|
srvtypes "github.com/cosmos/cosmos-sdk/server/types"
|
||||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||||
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
|
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||||
"github.com/cosmos/cosmos-sdk/x/genutil"
|
"github.com/cosmos/cosmos-sdk/x/genutil"
|
||||||
|
@ -90,7 +91,7 @@ func startInProcess(cfg Config, val *Validator) error {
|
||||||
select {
|
select {
|
||||||
case err := <-errCh:
|
case err := <-errCh:
|
||||||
return err
|
return err
|
||||||
case <-time.After(5 * time.Second): // assume server started successfully
|
case <-time.After(srvtypes.ServerStartTime): // assume server started successfully
|
||||||
}
|
}
|
||||||
|
|
||||||
val.api = apiSrv
|
val.api = apiSrv
|
||||||
|
@ -105,21 +106,10 @@ func startInProcess(cfg Config, val *Validator) error {
|
||||||
val.grpc = grpcSrv
|
val.grpc = grpcSrv
|
||||||
|
|
||||||
if val.AppConfig.GRPCWeb.Enable {
|
if val.AppConfig.GRPCWeb.Enable {
|
||||||
errCh1 := make(chan error)
|
val.grpcWeb, err = servergrpc.StartGRPCWeb(grpcSrv, *val.AppConfig)
|
||||||
go func() {
|
if err != nil {
|
||||||
grpcWeb, err := servergrpc.StartGRPCWeb(grpcSrv, *val.AppConfig)
|
|
||||||
if err != nil {
|
|
||||||
errCh1 <- err
|
|
||||||
}
|
|
||||||
|
|
||||||
val.grpcWeb = grpcWeb
|
|
||||||
}()
|
|
||||||
select {
|
|
||||||
case err := <-errCh1:
|
|
||||||
return err
|
return err
|
||||||
case <-time.After(5 * time.Second): // assume server started successfully
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue