X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b6d7efab2c4bffa3fabd55b166e44cca8ac1391f..48ef169e011a3335470e940cc0670bca27358dc1:/services/keep-balance/server.go diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go index 05658b5e5d..5299b96c1c 100644 --- a/services/keep-balance/server.go +++ b/services/keep-balance/server.go @@ -12,6 +12,7 @@ import ( "time" "git.arvados.org/arvados.git/sdk/go/arvados" + "github.com/jmoiron/sqlx" "github.com/sirupsen/logrus" ) @@ -23,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, @@ -46,10 +48,17 @@ type Server struct { Logger logrus.FieldLogger Dumper logrus.FieldLogger + + DB *sqlx.DB } // CheckHealth implements service.Handler. func (srv *Server) CheckHealth() error { + return srv.DB.Ping() +} + +// Done implements service.Handler. +func (srv *Server) Done() <-chan struct{} { return nil } @@ -70,6 +79,7 @@ func (srv *Server) run() { func (srv *Server) runOnce() (*Balancer, error) { bal := &Balancer{ + DB: srv.DB, Logger: srv.Logger, Dumper: srv.Dumper, Metrics: srv.Metrics,