forked from TrueCloudLab/frostfs-node
[#607] cmd/node: Serve gRPC on multiple interfaces
Generalize single gRPC interface of the storage node to a group of interfaces. Each interface calls the same RPC handler. Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
d1eb9c3b0f
commit
8060735732
13 changed files with 220 additions and 189 deletions
|
@ -2,33 +2,28 @@ package grpcconfig
|
|||
|
||||
import (
|
||||
"errors"
|
||||
"strconv"
|
||||
|
||||
"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
|
||||
)
|
||||
|
||||
const (
|
||||
subsection = "grpc"
|
||||
tlsSubsection = "tls"
|
||||
)
|
||||
|
||||
var (
|
||||
errEndpointNotSet = errors.New("empty/not set endpoint, see `grpc.endpoint` section")
|
||||
errTLSKeyNotSet = errors.New("empty/not set TLS key file path, see `grpc.tls.key` section")
|
||||
errTLSCertNotSet = errors.New("empty/not set TLS certificate file path, see `grpc.tls.certificate` section")
|
||||
)
|
||||
|
||||
// TLSConfig is a wrapper over "tls" config section which provides access
|
||||
// to TLS configuration of gRPC connection.
|
||||
type TLSConfig struct {
|
||||
cfg *config.Config
|
||||
}
|
||||
// Config is a wrapper over the config section
|
||||
// which provides access to gRPC server configurations.
|
||||
type Config config.Config
|
||||
|
||||
// Endpoint returns value of "endpoint" config parameter
|
||||
// from "grpc" section.
|
||||
// Endpoint returns value of "endpoint" config parameter.
|
||||
//
|
||||
// Panics if value is not a non-empty string.
|
||||
func Endpoint(c *config.Config) string {
|
||||
v := config.StringSafe(c.Sub(subsection), "endpoint")
|
||||
func (x *Config) Endpoint() string {
|
||||
v := config.StringSafe(
|
||||
(*config.Config)(x),
|
||||
"endpoint")
|
||||
if v == "" {
|
||||
panic(errEndpointNotSet)
|
||||
}
|
||||
|
@ -36,19 +31,27 @@ func Endpoint(c *config.Config) string {
|
|||
return v
|
||||
}
|
||||
|
||||
// TLS returns structure that provides access to "tls" subsection of
|
||||
// "grpc" section.
|
||||
func TLS(c *config.Config) TLSConfig {
|
||||
return TLSConfig{
|
||||
cfg: c.Sub(subsection).Sub(tlsSubsection),
|
||||
// TLS returns "tls" subsection as a TLSConfig.
|
||||
//
|
||||
// Returns nil if "enabled" value of "tls" subsection is false.
|
||||
func (x *Config) TLS() *TLSConfig {
|
||||
sub := (*config.Config)(x).
|
||||
Sub("tls")
|
||||
|
||||
if !config.BoolSafe(sub, "enabled") {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &TLSConfig{
|
||||
cfg: sub,
|
||||
}
|
||||
}
|
||||
|
||||
// Enabled returns value of "enabled" config parameter.
|
||||
//
|
||||
// Returns false if value is not set.
|
||||
func (tls TLSConfig) Enabled() bool {
|
||||
return config.BoolSafe(tls.cfg, "enabled")
|
||||
// TLSConfig is a wrapper over the config section
|
||||
// which provides access to TLS configurations
|
||||
// of the gRPC server.
|
||||
type TLSConfig struct {
|
||||
cfg *config.Config
|
||||
}
|
||||
|
||||
// KeyFile returns value of "key" config parameter.
|
||||
|
@ -74,3 +77,24 @@ func (tls TLSConfig) CertificateFile() string {
|
|||
|
||||
return v
|
||||
}
|
||||
|
||||
// IterateEndpoints iterates over subsections ["0":"N") (N - "num" value)
|
||||
// of "grpc" section of c, wrap them into Config and passes to f.
|
||||
//
|
||||
// Panics if N is not a positive number.
|
||||
func IterateEndpoints(c *config.Config, f func(*Config)) {
|
||||
c = c.Sub("grpc")
|
||||
|
||||
num := config.Uint(c, "num")
|
||||
if num == 0 {
|
||||
panic("no gRPC server configured")
|
||||
}
|
||||
|
||||
for i := uint64(0); i < num; i++ {
|
||||
si := strconv.FormatUint(i, 10)
|
||||
|
||||
sc := (*Config)(c.Sub(si))
|
||||
|
||||
f(sc)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,49 +10,35 @@ import (
|
|||
|
||||
func TestGRPCSection(t *testing.T) {
|
||||
t.Run("defaults", func(t *testing.T) {
|
||||
empty := configtest.EmptyConfig()
|
||||
|
||||
tlsEnabled := TLS(empty).Enabled()
|
||||
|
||||
require.Equal(t, false, tlsEnabled)
|
||||
|
||||
require.PanicsWithError(
|
||||
t,
|
||||
errEndpointNotSet.Error(),
|
||||
func() {
|
||||
Endpoint(empty)
|
||||
},
|
||||
)
|
||||
|
||||
require.PanicsWithError(
|
||||
t,
|
||||
errTLSKeyNotSet.Error(),
|
||||
func() {
|
||||
TLS(empty).KeyFile()
|
||||
},
|
||||
)
|
||||
|
||||
require.PanicsWithError(
|
||||
t,
|
||||
errTLSCertNotSet.Error(),
|
||||
func() {
|
||||
TLS(empty).CertificateFile()
|
||||
},
|
||||
)
|
||||
require.Panics(t, func() {
|
||||
IterateEndpoints(configtest.EmptyConfig(), nil)
|
||||
})
|
||||
})
|
||||
|
||||
const path = "../../../../config/example/node"
|
||||
|
||||
var fileConfigTest = func(c *config.Config) {
|
||||
addr := Endpoint(c)
|
||||
tlsEnabled := TLS(c).Enabled()
|
||||
tlsCert := TLS(c).CertificateFile()
|
||||
tlsKey := TLS(c).KeyFile()
|
||||
num := 0
|
||||
|
||||
require.Equal(t, "s01.neofs.devenv:8080", addr)
|
||||
require.Equal(t, true, tlsEnabled)
|
||||
require.Equal(t, "/path/to/cert", tlsCert)
|
||||
require.Equal(t, "/path/to/key", tlsKey)
|
||||
IterateEndpoints(c, func(sc *Config) {
|
||||
defer func() {
|
||||
num++
|
||||
}()
|
||||
|
||||
tls := sc.TLS()
|
||||
|
||||
switch num {
|
||||
case 0:
|
||||
require.Equal(t, "s01.neofs.devenv:8080", sc.Endpoint())
|
||||
|
||||
require.Equal(t, "/path/to/cert", tls.CertificateFile())
|
||||
require.Equal(t, "/path/to/key", tls.KeyFile())
|
||||
case 1:
|
||||
require.Equal(t, "s02.neofs.devenv:8080", sc.Endpoint())
|
||||
|
||||
require.Nil(t, tls)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
configtest.ForEachFileType(path, fileConfigTest)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue