From 22f5bc643cb32c171fd6d58bb04f11dd4c6a531d Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Mon, 3 Jul 2023 12:28:36 -0700
Subject: [PATCH] fix: honor older scanner settings only if newer has not
 changed (#17564)

---
 internal/config/scanner/scanner.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/internal/config/scanner/scanner.go b/internal/config/scanner/scanner.go
index cab62fe63..3e11dacba 100644
--- a/internal/config/scanner/scanner.go
+++ b/internal/config/scanner/scanner.go
@@ -85,14 +85,17 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
 		return cfg, err
 	}
 
-	// Stick to loading deprecated config/env if they are already set
-	if kvs.Get(Delay) != "" && kvs.Get(MaxWait) != "" && kvs.Get(Cycle) != "" {
-		return lookupDeprecatedScannerConfig(kvs)
+	// Stick to loading deprecated config/env if they are already set, and the Speed value
+	// has not been changed from its "default" value, if it has been changed honor new settings.
+	if kvs.GetWithDefault(Speed, DefaultKVS) == "default" {
+		if kvs.Get(Delay) != "" && kvs.Get(MaxWait) != "" {
+			return lookupDeprecatedScannerConfig(kvs)
+		}
 	}
 
 	switch speed := env.Get(EnvSpeed, kvs.GetWithDefault(Speed, DefaultKVS)); speed {
 	case "fastest":
-		cfg.Delay, cfg.MaxWait, cfg.Cycle = 0, 0, 0
+		cfg.Delay, cfg.MaxWait, cfg.Cycle = 0, 0, time.Second
 	case "fast":
 		cfg.Delay, cfg.MaxWait, cfg.Cycle = 1, 100*time.Millisecond, time.Minute
 	case "default":