X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0020a0bc96ee13203fbdc2af28ffa077799213d0..48ef169e011a3335470e940cc0670bca27358dc1:/services/keep-balance/server.go

diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index 23e597c89e..5299b96c1c 100644
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -5,18 +5,14 @@
 package main
 
 import (
-	"context"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/auth"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
-	"github.com/julienschmidt/httprouter"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"github.com/jmoiron/sqlx"
 	"github.com/sirupsen/logrus"
 )
 
@@ -28,11 +24,12 @@ import (
 //
 // RunOptions fields are controlled by command line flags.
 type RunOptions struct {
-	Once        bool
-	CommitPulls bool
-	CommitTrash bool
-	Logger      logrus.FieldLogger
-	Dumper      logrus.FieldLogger
+	Once                  bool
+	CommitPulls           bool
+	CommitTrash           bool
+	CommitConfirmedFields bool
+	Logger                logrus.FieldLogger
+	Dumper                logrus.FieldLogger
 
 	// SafeRendezvousState from the most recent balance operation,
 	// or "" if unknown. If this changes from one run to the next,
@@ -42,31 +39,30 @@ type RunOptions struct {
 }
 
 type Server struct {
+	http.Handler
+
 	Cluster    *arvados.Cluster
 	ArvClient  *arvados.Client
 	RunOptions RunOptions
 	Metrics    *metrics
 
-	httpHandler http.Handler
-
 	Logger logrus.FieldLogger
 	Dumper logrus.FieldLogger
-}
 
-// ServeHTTP implements service.Handler.
-func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	srv.httpHandler.ServeHTTP(w, r)
+	DB *sqlx.DB
 }
 
 // CheckHealth implements service.Handler.
 func (srv *Server) CheckHealth() error {
-	return nil
+	return srv.DB.Ping()
 }
 
-// Start sets up and runs the balancer.
-func (srv *Server) Start(ctx context.Context) {
-	srv.init(ctx)
+// Done implements service.Handler.
+func (srv *Server) Done() <-chan struct{} {
+	return nil
+}
 
+func (srv *Server) run() {
 	var err error
 	if srv.RunOptions.Once {
 		_, err = srv.runOnce()
@@ -75,34 +71,15 @@ func (srv *Server) Start(ctx context.Context) {
 	}
 	if err != nil {
 		srv.Logger.Error(err)
-	}
-}
-
-func (srv *Server) init(ctx context.Context) {
-	if srv.RunOptions.Logger == nil {
-		srv.RunOptions.Logger = ctxlog.FromContext(ctx)
-	}
-
-	srv.Logger = srv.RunOptions.Logger
-	srv.Dumper = srv.RunOptions.Dumper
-
-	if srv.Cluster.ManagementToken == "" {
-		srv.httpHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "Management API authentication is not configured", http.StatusForbidden)
-		})
+		os.Exit(1)
 	} else {
-		mux := httprouter.New()
-		metricsH := promhttp.HandlerFor(srv.Metrics.reg, promhttp.HandlerOpts{
-			ErrorLog: srv.Logger,
-		})
-		mux.Handler("GET", "/metrics", metricsH)
-		mux.Handler("GET", "/metrics.json", metricsH)
-		srv.httpHandler = auth.RequireLiteralToken(srv.Cluster.ManagementToken, mux)
+		os.Exit(0)
 	}
 }
 
 func (srv *Server) runOnce() (*Balancer, error) {
 	bal := &Balancer{
+		DB:             srv.DB,
 		Logger:         srv.Logger,
 		Dumper:         srv.Dumper,
 		Metrics:        srv.Metrics,