From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Mon, 30 Sep 2019 16:31:13 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into 14714-keep-balance-config
X-Git-Tag: 2.0.0~179^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/52b7b2934d5d74ee67ca13f8d1cc95f1379faddc

Merge remote-tracking branch 'origin/master' into 14714-keep-balance-config

refs #14714

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

52b7b2934d5d74ee67ca13f8d1cc95f1379faddc
diff --cc lib/config/deprecated.go
index 593a9bdcbc,d0e61dbca0..e6b06c1314
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@@ -475,77 -476,29 +476,104 @@@ func (ldr *Loader) loadOldGitHttpdConfi
  	return nil
  }
  
 +const defaultKeepBalanceConfigPath = "/etc/arvados/keep-balance/keep-balance.yml"
 +
 +type oldKeepBalanceConfig struct {
 +	Client              *arvados.Client
 +	Listen              *string
 +	KeepServiceTypes    *[]string
 +	KeepServiceList     *arvados.KeepServiceList
 +	RunPeriod           *arvados.Duration
 +	CollectionBatchSize *int
 +	CollectionBuffers   *int
 +	RequestTimeout      *arvados.Duration
 +	LostBlocksFile      *string
 +	ManagementToken     *string
 +}
 +
 +func (ldr *Loader) loadOldKeepBalanceConfig(cfg *arvados.Config) error {
 +	if ldr.KeepBalancePath == "" {
 +		return nil
 +	}
 +	var oc oldKeepBalanceConfig
 +	err := ldr.loadOldConfigHelper("keep-balance", ldr.KeepBalancePath, &oc)
 +	if os.IsNotExist(err) && ldr.KeepBalancePath == defaultKeepBalanceConfigPath {
 +		return nil
 +	} else if err != nil {
 +		return err
 +	}
 +
 +	cluster, err := cfg.GetCluster("")
 +	if err != nil {
 +		return err
 +	}
 +
 +	loadOldClientConfig(cluster, oc.Client)
 +
 +	if oc.Listen != nil {
 +		cluster.Services.Keepbalance.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{}
 +	}
 +	if oc.ManagementToken != nil {
 +		cluster.ManagementToken = *oc.ManagementToken
 +	}
 +	if oc.RunPeriod != nil {
 +		cluster.Collections.BalancePeriod = *oc.RunPeriod
 +	}
 +	if oc.LostBlocksFile != nil {
 +		cluster.Collections.BlobMissingReport = *oc.LostBlocksFile
 +	}
 +	if oc.CollectionBatchSize != nil {
 +		cluster.Collections.BalanceCollectionBatch = *oc.CollectionBatchSize
 +	}
 +	if oc.CollectionBuffers != nil {
 +		cluster.Collections.BalanceCollectionBuffers = *oc.CollectionBuffers
 +	}
 +	if oc.RequestTimeout != nil {
 +		cluster.API.KeepServiceRequestTimeout = *oc.RequestTimeout
 +	}
 +
 +	msg := "The %s configuration option is no longer supported. Please remove it from your configuration file. Keep-balance will operate on all configured volumes."
 +
 +	// If the keep service type provided is "disk" silently ignore it, since
 +	// this is what ends up being done anyway.
 +	if oc.KeepServiceTypes != nil {
 +		numTypes := len(*oc.KeepServiceTypes)
 +		if numTypes != 0 && !(numTypes == 1 && (*oc.KeepServiceTypes)[0] == "disk") {
 +			return fmt.Errorf(msg, "KeepServiceType")
 +		}
 +	}
 +
 +	if oc.KeepServiceList != nil {
 +		return fmt.Errorf(msg, "KeepServiceList")
 +	}
 +
 +	cfg.Clusters[cluster.ClusterID] = *cluster
 +	return nil
 +}
++
+ func (ldr *Loader) loadOldEnvironmentVariables(cfg *arvados.Config) error {
+ 	if os.Getenv("ARVADOS_API_TOKEN") == "" && os.Getenv("ARVADOS_API_HOST") == "" {
+ 		return nil
+ 	}
+ 	cluster, err := cfg.GetCluster("")
+ 	if err != nil {
+ 		return err
+ 	}
+ 	if tok := os.Getenv("ARVADOS_API_TOKEN"); tok != "" && cluster.SystemRootToken == "" {
+ 		ldr.Logger.Warn("SystemRootToken missing from cluster config, falling back to ARVADOS_API_TOKEN environment variable")
+ 		cluster.SystemRootToken = tok
+ 	}
+ 	if apihost := os.Getenv("ARVADOS_API_HOST"); apihost != "" && cluster.Services.Controller.ExternalURL.Host == "" {
+ 		ldr.Logger.Warn("Services.Controller.ExternalURL missing from cluster config, falling back to ARVADOS_API_HOST(_INSECURE) environment variables")
+ 		u, err := url.Parse("https://" + apihost)
+ 		if err != nil {
+ 			return fmt.Errorf("cannot parse ARVADOS_API_HOST: %s", err)
+ 		}
+ 		cluster.Services.Controller.ExternalURL = arvados.URL(*u)
+ 		if i := os.Getenv("ARVADOS_API_HOST_INSECURE"); i != "" && i != "0" {
+ 			cluster.TLS.Insecure = true
+ 		}
+ 	}
+ 	cfg.Clusters[cluster.ClusterID] = *cluster
+ 	return nil
+ }