From d96225033527f4749842217b7609936856e04842 Mon Sep 17 00:00:00 2001 From: Ekaterina Pavlova Date: Tue, 14 Nov 2023 14:27:52 +0400 Subject: [PATCH] conrtol: set the highest priority for control service. Control ports should be initialised and start served first of all. Closes: #2585. Signed-off-by: Ekaterina Pavlova --- CHANGELOG.md | 1 + cmd/neofs-node/control.go | 8 +++----- cmd/neofs-node/main.go | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b378060e70..2c73ca4a751 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ Changelog for NeoFS Node - Transaction witness scope no longer uses CustomGroups relying on more strict Rules now (#2619) - New optimized SDK version is integrated (#2622) - IR uses internal LOCODE DB from Go package (#2610) +- The priority of metrics service is increased (#2585) ### Removed - deprecated `no-precheck` flag of `neofs-cli container set-eacl` (#2496) diff --git a/cmd/neofs-node/control.go b/cmd/neofs-node/control.go index 02ece79da74..7fa4330d3db 100644 --- a/cmd/neofs-node/control.go +++ b/cmd/neofs-node/control.go @@ -64,11 +64,9 @@ func initControlService(c *cfg) { control.RegisterControlServiceServer(c.cfgControlService.server, ctlSvc) - c.workers = append(c.workers, newWorkerFromFunc(func(ctx context.Context) { - runAndLog(c, "control", false, func(c *cfg) { - fatalOnErr(c.cfgControlService.server.Serve(lis)) - }) - })) + runAndLog(c, "control", true, func(c *cfg) { + fatalOnErr(c.cfgControlService.server.Serve(lis)) + }) } func (c *cfg) NetmapStatus() control.NetmapStatus { diff --git a/cmd/neofs-node/main.go b/cmd/neofs-node/main.go index 907e85d63ef..7e0a113fdb6 100644 --- a/cmd/neofs-node/main.go +++ b/cmd/neofs-node/main.go @@ -79,6 +79,7 @@ func initAndLog(c *cfg, name string, initializer func(*cfg)) { } func initApp(c *cfg) { + initAndLog(c, "control", initControlService) initLocalStorage(c) c.ctx, c.ctxCancel = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) @@ -99,7 +100,6 @@ func initApp(c *cfg) { initAndLog(c, "pprof", initProfiler) initAndLog(c, "prometheus", initMetrics) initAndLog(c, "tree", initTreeService) - initAndLog(c, "control", initControlService) initAndLog(c, "morph notifications", listenMorphNotifications)