From 36e24f7f78efa0ae85c7847415f88a3bba1d6348 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 6 May 2022 14:58:36 +0300 Subject: [PATCH] [#1342] neofs-node: Use the default endpoint for tree service Signed-off-by: Evgenii Stratonikov --- cmd/neofs-node/config/tree/config.go | 39 ----------------------- cmd/neofs-node/config/tree/config_test.go | 30 ----------------- cmd/neofs-node/tree.go | 25 +++------------ config/example/node.env | 3 -- config/example/node.json | 5 --- config/example/node.yaml | 4 --- 6 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 cmd/neofs-node/config/tree/config.go delete mode 100644 cmd/neofs-node/config/tree/config_test.go diff --git a/cmd/neofs-node/config/tree/config.go b/cmd/neofs-node/config/tree/config.go deleted file mode 100644 index 8fdc1101..00000000 --- a/cmd/neofs-node/config/tree/config.go +++ /dev/null @@ -1,39 +0,0 @@ -package treeconfig - -import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" -) - -// GRPCConfig is a wrapper over "grpc" config section which provides access -// to gRPC configuration of control service. -type GRPCConfig struct { - cfg *config.Config -} - -const ( - subsection = "tree" - grpcSubsection = "grpc" - - // GRPCEndpointDefault is a default endpoint of gRPC Control service. - GRPCEndpointDefault = "" -) - -// GRPC returns structure that provides access to "grpc" subsection of -// "tree" section. -func GRPC(c *config.Config) GRPCConfig { - return GRPCConfig{ - c.Sub(subsection).Sub(grpcSubsection), - } -} - -// Endpoint returns value of "endpoint" config parameter. -// -// Returns GRPCEndpointDefault if value is not a non-empty string. -func (g GRPCConfig) Endpoint() string { - v := config.String(g.cfg, "endpoint") - if v != "" { - return v - } - - return GRPCEndpointDefault -} diff --git a/cmd/neofs-node/config/tree/config_test.go b/cmd/neofs-node/config/tree/config_test.go deleted file mode 100644 index 9ac92fe6..00000000 --- a/cmd/neofs-node/config/tree/config_test.go +++ /dev/null @@ -1,30 +0,0 @@ -package treeconfig_test - -import ( - "testing" - - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" - treeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/tree" - "github.com/stretchr/testify/require" -) - -func TestControlSection(t *testing.T) { - t.Run("defaults", func(t *testing.T) { - empty := configtest.EmptyConfig() - - require.Equal(t, treeconfig.GRPCEndpointDefault, treeconfig.GRPC(empty).Endpoint()) - }) - - const path = "../../../../config/example/node" - - var fileConfigTest = func(c *config.Config) { - require.Equal(t, "127.0.0.1:8091", treeconfig.GRPC(c).Endpoint()) - } - - configtest.ForEachFileType(path, fileConfigTest) - - t.Run("ENV", func(t *testing.T) { - configtest.ForEnvFileType(path, fileConfigTest) - }) -} diff --git a/cmd/neofs-node/tree.go b/cmd/neofs-node/tree.go index 37dd331e..95987402 100644 --- a/cmd/neofs-node/tree.go +++ b/cmd/neofs-node/tree.go @@ -2,19 +2,11 @@ package main import ( "context" - "net" - treeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/tree" "github.com/nspcc-dev/neofs-node/pkg/services/tree" - "google.golang.org/grpc" ) func initTreeService(c *cfg) { - endpoint := treeconfig.GRPC(c.appCfg).Endpoint() - if endpoint == treeconfig.GRPCEndpointDefault { - return - } - treeSvc := tree.New( tree.WithContainerSource(c.cfgObject.cnrSource), tree.WithNetmapSource(c.netMapSource), @@ -22,20 +14,13 @@ func initTreeService(c *cfg) { tree.WithLogger(c.log), tree.WithStorage(c.cfgObject.cfgLocalStorage.localStorage)) - treeServer := grpc.NewServer() - - c.onShutdown(func() { - stopGRPC("NeoFS Tree Service API", treeServer, c.log) - treeSvc.Shutdown() - }) - - lis, err := net.Listen("tcp", endpoint) - fatalOnErr(err) - - tree.RegisterTreeServiceServer(treeServer, treeSvc) + for _, srv := range c.cfgGRPC.servers { + tree.RegisterTreeServiceServer(srv, treeSvc) + } c.workers = append(c.workers, newWorkerFromFunc(func(ctx context.Context) { treeSvc.Start(ctx) - fatalOnErr(treeServer.Serve(lis)) })) + + c.onShutdown(treeSvc.Shutdown) } diff --git a/config/example/node.env b/config/example/node.env index 1c31501f..3c674ee7 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -46,9 +46,6 @@ NEOFS_GRPC_1_TLS_ENABLED=false NEOFS_CONTROL_AUTHORIZED_KEYS="035839e45d472a3b7769a2a1bd7d54c4ccd4943c3b40f547870e83a8fcbfb3ce11 028f42cfcb74499d7b15b35d9bff260a1c8d27de4f446a627406a382d8961486d6" NEOFS_CONTROL_GRPC_ENDPOINT=localhost:8090 -# Tree service section -NEOFS_TREE_GRPC_ENDPOINT=127.0.0.1:8091 - # Contracts section NEOFS_CONTRACTS_BALANCE=5263abba1abedbf79bb57f3e40b50b4425d2d6cd NEOFS_CONTRACTS_CONTAINER=5d084790d7aa36cea7b53fe897380dab11d2cd3c diff --git a/config/example/node.json b/config/example/node.json index b3ae7850..569aff46 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -84,11 +84,6 @@ "endpoint": "localhost:8090" } }, - "tree": { - "grpc": { - "endpoint": "127.0.0.1:8091" - } - }, "contracts": { "balance": "5263abba1abedbf79bb57f3e40b50b4425d2d6cd", "container": "5d084790d7aa36cea7b53fe897380dab11d2cd3c", diff --git a/config/example/node.yaml b/config/example/node.yaml index 3465eb07..b3eec638 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -66,10 +66,6 @@ control: grpc: endpoint: localhost:8090 # endpoint that is listened by the Control Service -tree: - grpc: - endpoint: 127.0.0.1:8091 # endpoint that is listened by the Tree Service - contracts: # side chain NEOFS contract script hashes; optional, override values retrieved from NNS contract balance: 5263abba1abedbf79bb57f3e40b50b4425d2d6cd container: 5d084790d7aa36cea7b53fe897380dab11d2cd3c