X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1c6464fc1b6e3cde61b64fc07308a3934966fe74..325ba452bdb2b8ebe4ef2a85d495291429df8082:/services/keep-balance/main.go

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index cf844ab050..80b1ed301f 100644
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -11,10 +11,12 @@ import (
 	"io"
 	"os"
 
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/lib/service"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
+	"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/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 )
@@ -50,10 +52,17 @@ func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.W
 		options.Dumper = dumper
 	}
 
-	// Only pass along the version flag, which gets handled in RunCommand
+	// 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,
+	}
 	flags.Visit(func(f *flag.Flag) {
-		if f.Name == "version" {
+		if !dropFlag[f.Name] {
 			args = append(args, "-"+f.Name, f.Value.String())
 		}
 	})
@@ -70,6 +79,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)
 			}
@@ -81,6 +102,12 @@ 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,
+				Prefix: "/_health/",
+				Routes: health.Routes{"ping": srv.CheckHealth},
 			}
 
 			go srv.run()