From 5ffded80f04bc1b38574b0a4eee54c6ceb9b9112 Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Thu, 3 Oct 2019 14:45:47 -0400 Subject: [PATCH] 14714: Improves error message when using the legacy keep-balance config Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- doc/admin/upgrading.html.textile.liquid | 2 +- lib/config/deprecated.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid index 2ec636a639..cfb36cef80 100644 --- a/doc/admin/upgrading.html.textile.liquid +++ b/doc/admin/upgrading.html.textile.liquid @@ -58,7 +58,7 @@ h4. Keep-balance configuration migration You can no longer specify types of keep services to balance via the @KeepServiceTypes@ config option in the legacy config at @/etc/arvados/keep-balance/keep-balance.yml@. If you are still using the legacy config and @KeepServiceTypes@ has a value other than "disk", keep-balance will produce an error. -You can no longer specify individual keep services to balance via the @config.KeepServiceList@ command line option or @KeepServiceList@ legacy config option. Instead, keep-balance operates on all configured volumes. If you are still using the legacy config, @KeepServiceList@ should be removed or keep-balance will produce an error. +You can no longer specify individual keep services to balance via the @config.KeepServiceList@ command line option or @KeepServiceList@ legacy config option. Instead, keep-balance will operate on all volumes of service type @disk@ as reported by the @arv keep_service list@ command. If you are still using the legacy config, @KeepServiceList@ should be removed or keep-balance will produce an error. Please see the "config migration guide":{{site.baseurl}}/admin/config-migration.html and "keep-balance install guide":{{site.baseurl}}/install/install-keep-balance.html for more details. diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go index e6b06c1314..22eed080a2 100644 --- a/lib/config/deprecated.go +++ b/lib/config/deprecated.go @@ -532,7 +532,7 @@ func (ldr *Loader) loadOldKeepBalanceConfig(cfg *arvados.Config) error { 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." + msg := "The %s configuration option is no longer supported. Please remove it from your configuration file. See the keep-balance upgrade notes at https://doc.arvados.org/admin/upgrading.html for more details." // If the keep service type provided is "disk" silently ignore it, since // this is what ends up being done anyway. -- 2.30.2