Merge branch 'master' into 11850-singlecontainer-max-requirements

[arvados.git] / services / keep-balance / main.go

diff --git a/services/keep-balance/main.go b/services/keep-balance/main.go
index 60349e91d8b9064c9715db9c701cd9b11b9ef8d3..947033564df01e479d05682617fc041417e5d54f 100644 (file)
--- a/services/keep-balance/main.go
+++ b/services/keep-balance/main.go
@@ -1,8 +1,13 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+

 package main
 
 import (
        "encoding/json"
        "flag"
 package main
 
 import (
        "encoding/json"
        "flag"

+       "fmt"

        "log"
        "os"
        "os/signal"
        "log"
        "os"
        "os/signal"


@@ -13,6 +18,10 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/config"
 )
 
        "git.curoverse.com/arvados.git/sdk/go/config"
 )
 

+var version = "dev"
+
+const defaultConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
+

 // Config specifies site configuration, like API credentials and the
 // choice of which servers are to be balanced.
 //
 // Config specifies site configuration, like API credentials and the
 // choice of which servers are to be balanced.
 //


@@ -62,10 +71,10 @@ type RunOptions struct {
 var debugf = func(string, ...interface{}) {}
 
 func main() {
 var debugf = func(string, ...interface{}) {}
 
 func main() {

-       var config Config
+       var cfg Config

        var runOptions RunOptions
 
        var runOptions RunOptions
 

-       configPath := flag.String("config", "",
+       configPath := flag.String("config", defaultConfigPath,

                "`path` of JSON or YAML configuration file")
        serviceListPath := flag.String("config.KeepServiceList", "",
                "`path` of JSON or YAML file with list of keep services to balance, as given by \"arv keep_service list\" "+
                "`path` of JSON or YAML configuration file")
        serviceListPath := flag.String("config.KeepServiceList", "",
                "`path` of JSON or YAML file with list of keep services to balance, as given by \"arv keep_service list\" "+


@@ -76,22 +85,33 @@ func main() {
                "send pull requests (make more replicas of blocks that are underreplicated or are not in optimal rendezvous probe order)")
        flag.BoolVar(&runOptions.CommitTrash, "commit-trash", false,
                "send trash requests (delete unreferenced old blocks, and excess replicas of overreplicated blocks)")
                "send pull requests (make more replicas of blocks that are underreplicated or are not in optimal rendezvous probe order)")
        flag.BoolVar(&runOptions.CommitTrash, "commit-trash", false,
                "send trash requests (delete unreferenced old blocks, and excess replicas of overreplicated blocks)")

+       dumpConfig := flag.Bool("dump-config", false, "write current configuration to stdout and exit")

        dumpFlag := flag.Bool("dump", false, "dump details for each block to stdout")
        debugFlag := flag.Bool("debug", false, "enable debug messages")
        dumpFlag := flag.Bool("dump", false, "dump details for each block to stdout")
        debugFlag := flag.Bool("debug", false, "enable debug messages")

+       getVersion := flag.Bool("version", false, "Print version information and exit.")

        flag.Usage = usage
        flag.Parse()
 
        flag.Usage = usage
        flag.Parse()
 

-       if *configPath == "" {
-               log.Fatal("You must specify a config file (see `keep-balance -help`)")
+       // Print version information if requested
+       if *getVersion {
+               fmt.Printf("keep-balance %s\n", version)
+               return

        }
        }

-       mustReadConfig(&config, *configPath)
+
+       mustReadConfig(&cfg, *configPath)

        if *serviceListPath != "" {
        if *serviceListPath != "" {

-               mustReadConfig(&config.KeepServiceList, *serviceListPath)
+               mustReadConfig(&cfg.KeepServiceList, *serviceListPath)
+       }
+
+       if *dumpConfig {
+               log.Fatal(config.DumpAndExit(cfg))

        }
 
        }
 

+       log.Printf("keep-balance %s started", version)
+

        if *debugFlag {
                debugf = log.Printf
        if *debugFlag {
                debugf = log.Printf

-               if j, err := json.Marshal(config); err != nil {
+               if j, err := json.Marshal(cfg); err != nil {

                        log.Fatal(err)
                } else {
                        log.Printf("config is %s", j)
                        log.Fatal(err)
                } else {
                        log.Printf("config is %s", j)


@@ -100,13 +120,13 @@ func main() {
        if *dumpFlag {
                runOptions.Dumper = log.New(os.Stdout, "", log.LstdFlags)
        }
        if *dumpFlag {
                runOptions.Dumper = log.New(os.Stdout, "", log.LstdFlags)
        }

-       err := CheckConfig(config, runOptions)
+       err := CheckConfig(cfg, runOptions)

        if err != nil {
                // (don't run)
        } else if runOptions.Once {
        if err != nil {
                // (don't run)
        } else if runOptions.Once {

-               _, err = (&Balancer{}).Run(config, runOptions)
+               _, err = (&Balancer{}).Run(cfg, runOptions)

        } else {
        } else {

-               err = RunForever(config, runOptions, nil)
+               err = RunForever(cfg, runOptions, nil)

        }
        if err != nil {
                log.Fatal(err)
        }
        if err != nil {
                log.Fatal(err)