X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/22422ab1e539977ca730aedd46b4cd919e73d05e..8b873a9b3b8865a4d451263e48b49122b9c32759:/lib/config/deprecated.go?ds=sidebyside diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index 614f5dcf97..019979d39f 100644 --- a/lib/config/deprecated.go +++ b/lib/config/deprecated.go @@ -108,19 +108,17 @@ type oldKeepstoreConfig struct { Debug *bool } -func (ldr *Loader) loadOldConfigHelper(component, path, defaultPath string, target interface{}) error { +func (ldr *Loader) loadOldConfigHelper(component, path string, target interface{}) error { if path == "" { return nil } buf, err := ioutil.ReadFile(path) - if os.IsNotExist(err) && path == defaultPath { - return nil - } else if err != nil { + if err != nil { return err - } else { - ldr.Logger.Warnf("you should remove the legacy %v config file (%s) after migrating all config keys to the cluster configuration file (%s)", component, path, ldr.Path) } + ldr.Logger.Warnf("you should remove the legacy %v config file (%s) after migrating all config keys to the cluster configuration file (%s)", component, path, ldr.Path) + err = yaml.Unmarshal(buf, target) if err != nil { return fmt.Errorf("%s: %s", path, err) @@ -130,9 +128,14 @@ func (ldr *Loader) loadOldConfigHelper(component, path, defaultPath string, targ // update config using values from an old-style keepstore config file. func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error { + if ldr.KeepstorePath == "" { + return nil + } var oc oldKeepstoreConfig - err := ldr.loadOldConfigHelper("keepstore", ldr.KeepstorePath, defaultKeepstoreConfigPath, &oc) - if err != nil { + err := ldr.loadOldConfigHelper("keepstore", ldr.KeepstorePath, &oc) + if os.IsNotExist(err) && (ldr.KeepstorePath == defaultKeepstoreConfigPath) { + return nil + } else if err != nil { return err } @@ -153,68 +156,242 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error { } type oldCrunchDispatchSlurmConfig struct { - Client arvados.Client + Client *arvados.Client - SbatchArguments []string - PollPeriod arvados.Duration - PrioritySpread int64 + SbatchArguments *[]string + PollPeriod *arvados.Duration + PrioritySpread *int64 // crunch-run command to invoke. The container UUID will be // appended. If nil, []string{"crunch-run"} will be used. // // Example: []string{"crunch-run", "--cgroup-parent-subsystem=memory"} - CrunchRunCommand []string + CrunchRunCommand *[]string // Extra RAM to reserve (in Bytes) for SLURM job, in addition // to the amount specified in the container's RuntimeConstraints - ReserveExtraRAM int64 + ReserveExtraRAM *int64 // Minimum time between two attempts to run the same container - MinRetryPeriod arvados.Duration + MinRetryPeriod *arvados.Duration // Batch size for container queries - BatchSize int64 + BatchSize *int64 } const defaultCrunchDispatchSlurmConfigPath = "/etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml" +func loadOldClientConfig(cluster *arvados.Cluster, client *arvados.Client) { + if client == nil { + return + } + if client.APIHost != "" { + cluster.Services.Controller.ExternalURL.Host = client.APIHost + } + if client.Scheme != "" { + cluster.Services.Controller.ExternalURL.Scheme = client.Scheme + } else { + cluster.Services.Controller.ExternalURL.Scheme = "https" + } + if client.AuthToken != "" { + cluster.SystemRootToken = client.AuthToken + } + cluster.TLS.Insecure = client.Insecure + ks := "" + for i, u := range client.KeepServiceURIs { + if i > 0 { + ks += " " + } + ks += u + } + cluster.Containers.SLURM.SbatchEnvironmentVariables = map[string]string{"ARVADOS_KEEP_SERVICES": ks} +} + // update config using values from an crunch-dispatch-slurm config file. func (ldr *Loader) loadOldCrunchDispatchSlurmConfig(cfg *arvados.Config) error { + if ldr.CrunchDispatchSlurmPath == "" { + return nil + } var oc oldCrunchDispatchSlurmConfig - err := ldr.loadOldConfigHelper("crunch-dispatch-slurm", ldr.CrunchDispatchSlurmPath, defaultCrunchDispatchSlurmConfigPath, &oc) + err := ldr.loadOldConfigHelper("crunch-dispatch-slurm", ldr.CrunchDispatchSlurmPath, &oc) + if os.IsNotExist(err) && (ldr.CrunchDispatchSlurmPath == defaultCrunchDispatchSlurmConfigPath) { + return nil + } else if err != nil { + return err + } + + cluster, err := cfg.GetCluster("") if err != nil { return err } + loadOldClientConfig(cluster, oc.Client) + + if oc.SbatchArguments != nil { + cluster.Containers.SLURM.SbatchArgumentsList = *oc.SbatchArguments + } + if oc.PollPeriod != nil { + cluster.Containers.CloudVMs.PollInterval = *oc.PollPeriod + } + if oc.PrioritySpread != nil { + cluster.Containers.SLURM.PrioritySpread = *oc.PrioritySpread + } + if oc.CrunchRunCommand != nil { + if len(*oc.CrunchRunCommand) >= 1 { + cluster.Containers.CrunchRunCommand = (*oc.CrunchRunCommand)[0] + } + if len(*oc.CrunchRunCommand) >= 2 { + cluster.Containers.CrunchRunArgumentsList = (*oc.CrunchRunCommand)[1:] + } + } + if oc.ReserveExtraRAM != nil { + cluster.Containers.ReserveExtraRAM = arvados.ByteSize(*oc.ReserveExtraRAM) + } + if oc.MinRetryPeriod != nil { + cluster.Containers.MinRetryPeriod = *oc.MinRetryPeriod + } + if oc.BatchSize != nil { + cluster.API.MaxItemsPerResponse = int(*oc.BatchSize) + } + + cfg.Clusters[cluster.ClusterID] = *cluster + return nil +} + +type oldWsConfig struct { + Client *arvados.Client + Postgres *arvados.PostgreSQLConnection + PostgresPool *int + Listen *string + LogLevel *string + LogFormat *string + + PingTimeout *arvados.Duration + ClientEventQueue *int + ServerEventQueue *int + + ManagementToken *string +} + +const defaultWebsocketConfigPath = "/etc/arvados/ws/ws.yml" + +// update config using values from an crunch-dispatch-slurm config file. +func (ldr *Loader) loadOldWebsocketConfig(cfg *arvados.Config) error { + if ldr.WebsocketPath == "" { + return nil + } + var oc oldWsConfig + err := ldr.loadOldConfigHelper("arvados-ws", ldr.WebsocketPath, &oc) + if os.IsNotExist(err) && ldr.WebsocketPath == defaultWebsocketConfigPath { + return nil + } else if err != nil { + return err + } + cluster, err := cfg.GetCluster("") if err != nil { return err } - u := arvados.URL{} - u.Host = oc.Client.APIHost - if oc.Client.Scheme != "" { - u.Scheme = oc.Client.Scheme - } else { - u.Scheme = "https" + loadOldClientConfig(cluster, oc.Client) + + if oc.Postgres != nil { + cluster.PostgreSQL.Connection = *oc.Postgres } - cluster.Services.Controller.ExternalURL = u - cluster.SystemRootToken = oc.Client.AuthToken - cluster.TLS.Insecure = oc.Client.Insecure + if oc.PostgresPool != nil { + cluster.PostgreSQL.ConnectionPool = *oc.PostgresPool + } + if oc.Listen != nil { + cluster.Services.Websocket.InternalURLs[arvados.URL{Host: *oc.Listen}] = arvados.ServiceInstance{} + } + if oc.LogLevel != nil { + cluster.SystemLogs.LogLevel = *oc.LogLevel + } + if oc.LogFormat != nil { + cluster.SystemLogs.Format = *oc.LogFormat + } + if oc.PingTimeout != nil { + cluster.API.SendTimeout = *oc.PingTimeout + } + if oc.ClientEventQueue != nil { + cluster.API.WebsocketClientEventQueue = *oc.ClientEventQueue + } + if oc.ServerEventQueue != nil { + cluster.API.WebsocketServerEventQueue = *oc.ServerEventQueue + } + if oc.ManagementToken != nil { + cluster.ManagementToken = *oc.ManagementToken + } + + cfg.Clusters[cluster.ClusterID] = *cluster + return nil +} + +const defaultKeepWebConfigPath = "/etc/arvados/keep-web/keep-web.yml" + +type oldKeepWebConfig struct { + Client *arvados.Client - cluster.Containers.SLURM.SbatchArgumentsList = oc.SbatchArguments - cluster.Containers.CloudVMs.PollInterval = oc.PollPeriod - cluster.Containers.SLURM.PrioritySpread = oc.PrioritySpread - if len(oc.CrunchRunCommand) >= 1 { - cluster.Containers.CrunchRunCommand = oc.CrunchRunCommand[0] + Listen string + + AnonymousTokens []string + AttachmentOnlyHost string + TrustAllContent bool + + Cache struct { + TTL arvados.Duration + UUIDTTL arvados.Duration + MaxCollectionEntries int + MaxCollectionBytes int64 + MaxPermissionEntries int + MaxUUIDEntries int } - if len(oc.CrunchRunCommand) >= 2 { - cluster.Containers.CrunchRunArgumentsList = oc.CrunchRunCommand[1:] + + // Hack to support old command line flag, which is a bool + // meaning "get actual token from environment". + deprecatedAllowAnonymous bool + + // Authorization token to be included in all health check requests. + ManagementToken string +} + +func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error { + if ldr.KeepWebPath == "" { + return nil + } + var oc oldKeepWebConfig + err := ldr.loadOldConfigHelper("keep-web", ldr.KeepWebPath, &oc) + if os.IsNotExist(err) && ldr.KeepWebPath == defaultKeepWebConfigPath { + return nil + } else if err != nil { + return err } - cluster.Containers.ReserveExtraRAM = arvados.ByteSize(oc.ReserveExtraRAM) - cluster.Containers.MinRetryPeriod = oc.MinRetryPeriod - cluster.API.MaxItemsPerResponse = int(oc.BatchSize) + cluster, err := cfg.GetCluster("") + if err != nil { + return err + } + + loadOldClientConfig(cluster, oc.Client) + + cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{} + cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: oc.Listen}] = arvados.ServiceInstance{} + cluster.Services.WebDAVDownload.ExternalURL = arvados.URL{Host: oc.AttachmentOnlyHost} + cluster.TLS.Insecure = oc.Client.Insecure + cluster.ManagementToken = oc.ManagementToken + cluster.Collections.TrustAllContent = oc.TrustAllContent + cluster.Collections.WebDAVCache.TTL = oc.Cache.TTL + cluster.Collections.WebDAVCache.UUIDTTL = oc.Cache.UUIDTTL + cluster.Collections.WebDAVCache.MaxCollectionEntries = oc.Cache.MaxCollectionEntries + cluster.Collections.WebDAVCache.MaxCollectionBytes = oc.Cache.MaxCollectionBytes + cluster.Collections.WebDAVCache.MaxPermissionEntries = oc.Cache.MaxPermissionEntries + cluster.Collections.WebDAVCache.MaxUUIDEntries = oc.Cache.MaxUUIDEntries + if len(oc.AnonymousTokens) > 0 { + cluster.Users.AnonymousUserToken = oc.AnonymousTokens[0] + if len(oc.AnonymousTokens) > 1 { + ldr.Logger.Warn("More than 1 anonymous tokens configured, using only the first and discarding the rest.") + } + } cfg.Clusters[cluster.ClusterID] = *cluster return nil