Skip to content

Commit 764706d

Browse files
dvovktaratorio
dvovk
and
taratorio
authored
fixed start diag server (#10236)
fixed start diag server if metrics address is different from pprof address --------- Co-authored-by: taratorio <[email protected]>
1 parent 40d1327 commit 764706d

File tree

11 files changed

+42
-30
lines changed

11 files changed

+42
-30
lines changed

‎cmd/caplin/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func runCaplinNode(cliCtx *cli.Context) error {
5555
log.Error("[Phase1] Could not initialize caplin", "err", err)
5656
return err
5757
}
58-
if _, _, err := debug.Setup(cliCtx, true /* root logger */); err != nil {
58+
if _, _, _, err := debug.Setup(cliCtx, true /* root logger */); err != nil {
5959
return err
6060
}
6161
rcfg := beacon_router_configuration.RouterConfiguration{

‎cmd/devnet/devnet/node.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ func (n *devnetNode) run(ctx *cli.Context) error {
140140
var logger log.Logger
141141
var err error
142142
var metricsMux *http.ServeMux
143+
var pprofMux *http.ServeMux
143144

144145
defer n.done()
145146
defer func() {
@@ -152,7 +153,7 @@ func (n *devnetNode) run(ctx *cli.Context) error {
152153
n.Unlock()
153154
}()
154155

155-
if logger, metricsMux, err = debug.Setup(ctx, false /* rootLogger */); err != nil {
156+
if logger, metricsMux, pprofMux, err = debug.Setup(ctx, false /* rootLogger */); err != nil {
156157
return err
157158
}
158159

@@ -184,7 +185,7 @@ func (n *devnetNode) run(ctx *cli.Context) error {
184185

185186
n.ethNode, err = enode.New(ctx.Context, n.nodeCfg, n.ethCfg, logger)
186187

187-
diagnostics.Setup(ctx, n.ethNode, metricsMux)
188+
diagnostics.Setup(ctx, n.ethNode, metricsMux, pprofMux)
188189

189190
n.Lock()
190191
if n.startErr != nil {

‎cmd/erigon/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ func runErigon(cliCtx *cli.Context) error {
4444
var logger log.Logger
4545
var err error
4646
var metricsMux *http.ServeMux
47+
var pprofMux *http.ServeMux
4748

48-
if logger, metricsMux, err = debug.Setup(cliCtx, true /* root logger */); err != nil {
49+
if logger, metricsMux, pprofMux, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
4950
return err
5051
}
5152

@@ -68,7 +69,7 @@ func runErigon(cliCtx *cli.Context) error {
6869
return err
6970
}
7071

71-
diagnostics.Setup(cliCtx, ethNode, metricsMux)
72+
diagnostics.Setup(cliCtx, ethNode, metricsMux, pprofMux)
7273

7374
err = ethNode.Serve()
7475
if err != nil {

‎cmd/silkworm_api/snapshot_idx.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func FindIf(segments []snaptype.FileInfo, predicate func(snaptype.FileInfo) bool
5656
}
5757

5858
func buildIndex(cliCtx *cli.Context, dataDir string, snapshotPaths []string, minBlock uint64) error {
59-
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
59+
logger, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
6060
if err != nil {
6161
return err
6262
}

‎diagnostics/setup.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ var (
1818
diagnosticsPortFlag = "diagnostics.endpoint.port"
1919
metricsHTTPFlag = "metrics.addr"
2020
metricsPortFlag = "metrics.port"
21+
pprofPortFlag = "pprof.port"
22+
pprofAddrFlag = "pprof.addr"
2123
)
2224

23-
func Setup(ctx *cli.Context, node *node.ErigonNode, metricsMux *http.ServeMux) {
25+
func Setup(ctx *cli.Context, node *node.ErigonNode, metricsMux *http.ServeMux, pprofMux *http.ServeMux) {
2426
if ctx.Bool(diagnosticsDisabledFlag) {
2527
return
2628
}
@@ -34,9 +36,14 @@ func Setup(ctx *cli.Context, node *node.ErigonNode, metricsMux *http.ServeMux) {
3436
metricsHost := ctx.String(metricsHTTPFlag)
3537
metricsPort := ctx.Int(metricsPortFlag)
3638
metricsAddress := fmt.Sprintf("%s:%d", metricsHost, metricsPort)
39+
pprofHost := ctx.String(pprofAddrFlag)
40+
pprofPort := ctx.Int(pprofPortFlag)
41+
pprofAddress := fmt.Sprintf("%s:%d", pprofHost, pprofPort)
3742

3843
if diagAddress == metricsAddress {
3944
diagMux = SetupDiagnosticsEndpoint(metricsMux, diagAddress)
45+
} else if diagAddress == pprofAddress && pprofMux != nil {
46+
diagMux = SetupDiagnosticsEndpoint(pprofMux, diagAddress)
4047
} else {
4148
diagMux = SetupDiagnosticsEndpoint(nil, diagAddress)
4249
}

‎turbo/app/backup_cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ CloudDrives (and ssd) have bad-latency and good-parallel-throughput - then havin
7777
)
7878

7979
func doBackup(cliCtx *cli.Context) error {
80-
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
80+
logger, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
8181
if err != nil {
8282
return err
8383
}

‎turbo/app/import_cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func importChain(cliCtx *cli.Context) error {
6060
if cliCtx.NArg() < 1 {
6161
utils.Fatalf("This command requires an argument.")
6262
}
63-
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
63+
logger, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
6464
if err != nil {
6565
return err
6666
}

‎turbo/app/init_cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ It expects the genesis file as argument.`,
3737
func initGenesis(cliCtx *cli.Context) error {
3838
var logger log.Logger
3939
var err error
40-
if logger, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
40+
if logger, _, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
4141
return err
4242
}
4343
// Make sure we have a valid genesis JSON

‎turbo/app/snapshots_cmd.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ var snapshotCommand = cli.Command{
6363
Name: "snapshots",
6464
Usage: `Managing snapshots (historical data partitions)`,
6565
Before: func(context *cli.Context) error {
66-
_, _, err := debug.Setup(context, true /* rootLogger */)
66+
_, _, _, err := debug.Setup(context, true /* rootLogger */)
6767
if err != nil {
6868
return err
6969
}
@@ -197,7 +197,7 @@ var (
197197
)
198198

199199
func doIntegrity(cliCtx *cli.Context) error {
200-
logger, _, err := debug.Setup(cliCtx, true /* root logger */)
200+
logger, _, _, err := debug.Setup(cliCtx, true /* root logger */)
201201
if err != nil {
202202
return err
203203
}
@@ -268,7 +268,7 @@ func doDiff(cliCtx *cli.Context) error {
268268
}
269269

270270
func doDecompressSpeed(cliCtx *cli.Context) error {
271-
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
271+
logger, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
272272
if err != nil {
273273
return err
274274
}
@@ -310,7 +310,7 @@ func doDecompressSpeed(cliCtx *cli.Context) error {
310310
func doRam(cliCtx *cli.Context) error {
311311
var logger log.Logger
312312
var err error
313-
if logger, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
313+
if logger, _, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
314314
return err
315315
}
316316
defer logger.Info("Done")
@@ -334,7 +334,7 @@ func doRam(cliCtx *cli.Context) error {
334334
}
335335

336336
func doIndicesCommand(cliCtx *cli.Context) error {
337-
logger, _, err := debug.Setup(cliCtx, true /* rootLogger */)
337+
logger, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
338338
if err != nil {
339339
return err
340340
}
@@ -433,7 +433,7 @@ func openSnaps(ctx context.Context, cfg ethconfig.BlocksFreezing, dirs datadir.D
433433
func doUncompress(cliCtx *cli.Context) error {
434434
var logger log.Logger
435435
var err error
436-
if logger, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
436+
if logger, _, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
437437
return err
438438
}
439439
ctx := cliCtx.Context
@@ -486,7 +486,7 @@ func doUncompress(cliCtx *cli.Context) error {
486486
func doCompress(cliCtx *cli.Context) error {
487487
var err error
488488
var logger log.Logger
489-
if logger, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
489+
if logger, _, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
490490
return err
491491
}
492492
ctx := cliCtx.Context
@@ -536,7 +536,7 @@ func doCompress(cliCtx *cli.Context) error {
536536
func doRetireCommand(cliCtx *cli.Context) error {
537537
var logger log.Logger
538538
var err error
539-
if logger, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
539+
if logger, _, _, err = debug.Setup(cliCtx, true /* rootLogger */); err != nil {
540540
return err
541541
}
542542
defer logger.Info("Done")
@@ -685,8 +685,9 @@ func doUploaderCommand(cliCtx *cli.Context) error {
685685
var logger log.Logger
686686
var err error
687687
var metricsMux *http.ServeMux
688+
var pprofMux *http.ServeMux
688689

689-
if logger, metricsMux, err = debug.Setup(cliCtx, true /* root logger */); err != nil {
690+
if logger, metricsMux, pprofMux, err = debug.Setup(cliCtx, true /* root logger */); err != nil {
690691
return err
691692
}
692693

@@ -709,7 +710,7 @@ func doUploaderCommand(cliCtx *cli.Context) error {
709710
return err
710711
}
711712

712-
diagnostics.Setup(cliCtx, ethNode, metricsMux)
713+
diagnostics.Setup(cliCtx, ethNode, metricsMux, pprofMux)
713714

714715
err = ethNode.Serve()
715716
if err != nil {

‎turbo/app/support_cmd.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ var supportCommand = cli.Command{
6767
Usage: "Connect Erigon instance to a diagnostics system for support",
6868
ArgsUsage: "--diagnostics.addr <URL for the diagnostics system> --ids <diagnostic session ids allowed to connect> --metrics.urls <http://erigon_host:metrics_port>",
6969
Before: func(cliCtx *cli.Context) error {
70-
_, _, err := debug.Setup(cliCtx, true /* rootLogger */)
70+
_, _, _, err := debug.Setup(cliCtx, true /* rootLogger */)
7171
if err != nil {
7272
return err
7373
}

0 commit comments

Comments
 (0)