From: Tom Clegg <tom@curii.com>
Date: Wed, 28 Jul 2021 04:13:50 +0000 (-0400)
Subject: 17574: add -pprof flag to service commands.
X-Git-Tag: 2.3.0~118^2~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d012d691bde541c8dae0dac4c00cb74ed30d9e47

17574: add -pprof flag to service commands.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 9ca2431258..40db4f9c7c 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -12,6 +12,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	_ "net/http/pprof"
 	"net/url"
 	"os"
 	"strings"
@@ -70,6 +71,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	loader := config.NewLoader(stdin, log)
 	loader.SetupFlags(flags)
 	versionFlag := flags.Bool("version", false, "Write version information to stdout and exit 0")
+	pprofAddr := flags.String("pprof", "", "Serve Go profile data at `[addr]:port`")
 	err = flags.Parse(args)
 	if err == flag.ErrHelp {
 		err = nil
@@ -80,6 +82,12 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 		return cmd.Version.RunCommand(prog, args, stdin, stdout, stderr)
 	}
 
+	if *pprofAddr != "" {
+		go func() {
+			log.Println(http.ListenAndServe(*pprofAddr, nil))
+		}()
+	}
+
 	if strings.HasSuffix(prog, "controller") {
 		// Some config-loader checks try to make API calls via
 		// controller. Those can't be expected to work if this
diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 93457fb827..90ae0695df 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -9,6 +9,8 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"net/http"
+	_ "net/http/pprof"
 	"os"
 
 	"git.arvados.org/arvados.git/lib/config"
@@ -40,6 +42,13 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 		"update collection fields (replicas_confirmed, storage_classes_confirmed, etc.)")
 	flags.Bool("version", false, "Write version information to stdout and exit 0")
 	dumpFlag := flags.Bool("dump", false, "dump details for each block to stdout")
+	pprofAddr := flags.String("pprof", "", "serve Go profile data at `[addr]:port`")
+
+	if *pprofAddr != "" {
+		go func() {
+			logrus.Println(http.ListenAndServe(*pprofAddr, nil))
+		}()
+	}
 
 	loader := config.NewLoader(os.Stdin, logger)
 	loader.SetupFlags(flags)