X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e8d1a643cdbc3a5f4c0e5c745da58d9f7e1248d8..9171d310942ea3c8e3bed3e21a1c2d0604e93ad6:/services/keep-balance/main.go

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 8b4ee84c71..f0b0df5bd3 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -2,67 +2,70 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepbalance
 
 import (
+	"bytes"
 	"context"
 	"flag"
 	"fmt"
 	"io"
-	"os"
+	_ "net/http/pprof"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/service"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	"git.arvados.org/arvados.git/sdk/go/health"
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/sirupsen/logrus"
 )
 
-func main() {
-	os.Exit(runCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
-}
+type command struct{}
 
-func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-	logger := ctxlog.FromContext(context.Background())
+var Command = command{}
 
+func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	var options RunOptions
-	flags := flag.NewFlagSet(prog, flag.ExitOnError)
+	flags := flag.NewFlagSet(prog, flag.ContinueOnError)
 	flags.BoolVar(&options.Once, "once", false,
 		"balance once and then exit")
 	flags.BoolVar(&options.CommitPulls, "commit-pulls", false,
 		"send pull requests (make more replicas of blocks that are underreplicated or are not in optimal rendezvous probe order)")
 	flags.BoolVar(&options.CommitTrash, "commit-trash", false,
 		"send trash requests (delete unreferenced old blocks, and excess replicas of overreplicated blocks)")
+	flags.BoolVar(&options.CommitConfirmedFields, "commit-confirmed-fields", true,
+		"update collection fields (replicas_confirmed, storage_classes_confirmed, etc.)")
+	// These options are implemented by service.Command, so we
+	// don't need the vars here -- we just need the flags
+	// to pass flags.Parse().
+	flags.Bool("dump", false, "dump details for each block to stdout")
+	flags.String("pprof", "", "serve Go profile data at `[addr]:port`")
 	flags.Bool("version", false, "Write version information to stdout and exit 0")
-	dumpFlag := flags.Bool("dump", false, "dump details for each block to stdout")
 
-	loader := config.NewLoader(os.Stdin, logger)
+	logger := ctxlog.New(stderr, "json", "info")
+	loader := config.NewLoader(&bytes.Buffer{}, logger)
 	loader.SetupFlags(flags)
-
 	munged := loader.MungeLegacyConfigArgs(logger, args, "-legacy-keepbalance-config")
-	flags.Parse(munged)
-
-	if *dumpFlag {
-		dumper := logrus.New()
-		dumper.Out = os.Stdout
-		dumper.Formatter = &logrus.TextFormatter{}
-		options.Dumper = dumper
+	if ok, code := cmd.ParseFlags(flags, prog, munged, "", stderr); !ok {
+		return code
 	}
 
 	// Drop our custom args that would be rejected by the generic
 	// service.Command
 	args = nil
 	dropFlag := map[string]bool{
-		"once":         true,
-		"commit-pulls": true,
-		"commit-trash": true,
-		"dump":         true,
+		"once":                    true,
+		"commit-pulls":            true,
+		"commit-trash":            true,
+		"commit-confirmed-fields": true,
+		"dump":                    true,
 	}
 	flags.Visit(func(f *flag.Flag) {
 		if !dropFlag[f.Name] {
-			args = append(args, "-"+f.Name, f.Value.String())
+			args = append(args, "-"+f.Name+"="+f.Value.String())
 		}
 	})
 
@@ -78,6 +81,18 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 				return service.ErrorHandler(ctx, cluster, fmt.Errorf("error initializing client from cluster config: %s", err))
 			}
 
+			db, err := sqlx.Open("postgres", cluster.PostgreSQL.Connection.String())
+			if err != nil {
+				return service.ErrorHandler(ctx, cluster, fmt.Errorf("postgresql connection failed: %s", err))
+			}
+			if p := cluster.PostgreSQL.ConnectionPool; p > 0 {
+				db.SetMaxOpenConns(p)
+			}
+			err = db.Ping()
+			if err != nil {
+				return service.ErrorHandler(ctx, cluster, fmt.Errorf("postgresql connection succeeded but ping failed: %s", err))
+			}
+
 			if options.Logger == nil {
 				options.Logger = ctxlog.FromContext(ctx)
 			}
@@ -89,6 +104,7 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 				Metrics:    newMetrics(registry),
 				Logger:     options.Logger,
 				Dumper:     options.Dumper,
+				DB:         db,
 			}
 			srv.Handler = &health.Handler{
 				Token:  cluster.ManagementToken,