TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 96 Pull requests 4 Projects Releases 1 Activity Actions

node: Start metrics and pprof as soon as possible #882

Merged
fyrchik merged 1 commit from dstepanov-yadro/frostfs-node:fix/metrics_start_order into master 2023-12-21 15:09:55 +00:00
Conversation 0 Commits 1 Files changed 2 +9 -21
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/frostfs-node/httpcomponent.go
View file

@ -36,20 +36,18 @@ func (cmp *httpComponent) init(c *cfg) {
cmp.shutdownDur, cmp.shutdownDur,
), ),
) )
c.closers = append(c.closers, closer{ c.wg.Add(1)
cmp.name, go func() {
func() { stopAndLog(c, cmp.name, srv.Shutdown) }, defer c.wg.Done()
})
c.workers = append(c.workers, worker{
cmp.name,
func(ctx context.Context) {
runAndLog(ctx, c, cmp.name, false, func(context.Context, *cfg) {
c.log.Info(logs.FrostFSNodeStartListeningEndpoint, c.log.Info(logs.FrostFSNodeStartListeningEndpoint,
zap.String("service", cmp.name), zap.String("service", cmp.name),
zap.String("endpoint", cmp.address)) zap.String("endpoint", cmp.address))
fatalOnErr(srv.Serve()) fatalOnErr(srv.Serve())
fyrchik commented 2023-12-21 12:26:20 +00:00
Review
Copy link

Not the case here (everything is on localhost), but what about your recent optimization regarding rebinging to a not-yet-available IP, will it work?

Not the case here (everything is on localhost), but what about your recent optimization regarding rebinging to a not-yet-available IP, will it work?
dstepanov-yadro commented 2023-12-21 13:01:58 +00:00
Review
Copy link

Now not

Now not
fyrchik commented 2023-12-21 15:09:45 +00:00
Review
Copy link

Ok, our current configuration everywhere uses localhost, so #836 is still useful.

Ok, our current configuration everywhere uses localhost, so #836 is still useful.
}) }()
}, c.closers = append(c.closers, closer{
cmp.name,
func() { stopAndLog(c, cmp.name, srv.Shutdown) },
}) })
} }
@ -64,7 +62,6 @@ func (cmp *httpComponent) reload(ctx context.Context) error {
} }
// Cleanup // Cleanup
delCloser(cmp.cfg, cmp.name) delCloser(cmp.cfg, cmp.name)
delWorker(cmp.cfg, cmp.name)
// Init server with new parameters // Init server with new parameters
cmp.init(cmp.cfg) cmp.init(cmp.cfg)
// Start worker // Start worker

9
cmd/frostfs-node/worker.go
View file

@ -30,15 +30,6 @@ func startWorker(ctx context.Context, c *cfg, wrk worker) {
}(wrk) }(wrk)
} }
func delWorker(c *cfg, name string) {
for i, worker := range c.workers {
if worker.name == name {
c.workers = append(c.workers[:i], c.workers[i+1:]...)
return
}
}
}
func getWorker(c *cfg, name string) *worker { func getWorker(c *cfg, name string) *worker {
for _, wrk := range c.workers { for _, wrk := range c.workers {
if wrk.name == name { if wrk.name == name {