scanner: Add a config to disable short sleep between objects scan (#18734)

Add a hidden configuration under the scanner sub section to configure if
the scanner should sleep between two objects scan. The configuration has
only effect when there is no drive activity related to s3 requests or
healing.

By default, the code will keep the current behavior which is doing
sleep between objects.

To forcefully enable the full scan speed in idle mode, you can do this:

   `mc admin config set myminio scanner idle_speed=full`
This commit is contained in:
Anis Eleuch 2024-01-04 15:07:17 -08:00 committed by GitHub
parent 414bcb0c73
commit 7705605b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 19 deletions

View File

@ -600,6 +600,7 @@ func applyDynamicConfigForSubSys(ctx context.Context, objAPI ObjectLayer, s conf
return fmt.Errorf("Unable to apply scanner config: %w", err) return fmt.Errorf("Unable to apply scanner config: %w", err)
} }
// update dynamic scanner values. // update dynamic scanner values.
scannerIdleMode.Store(scannerCfg.IdleMode)
scannerCycle.Store(scannerCfg.Cycle) scannerCycle.Store(scannerCfg.Cycle)
logger.LogIf(ctx, scannerSleeper.Update(scannerCfg.Delay, scannerCfg.MaxWait)) logger.LogIf(ctx, scannerSleeper.Update(scannerCfg.Delay, scannerCfg.MaxWait))
case config.LoggerWebhookSubSys: case config.LoggerWebhookSubSys:

View File

@ -65,8 +65,9 @@ var (
globalHealConfig heal.Config globalHealConfig heal.Config
// Sleeper values are updated when config is loaded. // Sleeper values are updated when config is loaded.
scannerSleeper = newDynamicSleeper(2, time.Second, true) // Keep defaults same as config defaults scannerSleeper = newDynamicSleeper(2, time.Second, true) // Keep defaults same as config defaults
scannerCycle = uatomic.NewDuration(dataScannerStartDelay) scannerCycle = uatomic.NewDuration(dataScannerStartDelay)
scannerIdleMode = uatomic.NewInt32(0) // default is throttled when idle
) )
// initDataScanner will start the scanner in the background. // initDataScanner will start the scanner in the background.

View File

@ -286,8 +286,7 @@ func (p *xlStorageDiskIDCheck) NSScanner(ctx context.Context, cache dataUsageCac
} }
weSleep := func() bool { weSleep := func() bool {
// Entire queue is full, so we sleep. return scannerIdleMode.Load() == 0
return cap(p.health.tokens) == len(p.health.tokens)
} }
return p.storage.NSScanner(ctx, cache, updates, scanMode, weSleep) return p.storage.NSScanner(ctx, cache, updates, scanMode, weSleep)

View File

@ -130,9 +130,9 @@ var (
Value: "5m", Value: "5m",
}, },
config.KV{ config.KV{
Key: apiDisableODirect, Key: apiDisableODirect,
Value: "", Value: "",
Deprecated: true, HiddenIfEmpty: true,
}, },
config.KV{ config.KV{
Key: apiODirect, Key: apiODirect,

View File

@ -274,7 +274,7 @@ type KV struct {
Key string `json:"key"` Key string `json:"key"`
Value string `json:"value"` Value string `json:"value"`
Deprecated bool `json:"-"` HiddenIfEmpty bool `json:"-"`
} }
func (kv KV) String() string { func (kv KV) String() string {
@ -1447,7 +1447,7 @@ func (cs *SubsysInfo) WriteTo(b *strings.Builder, off bool) {
continue continue
} }
// Ignore empty and deprecated values // Ignore empty and deprecated values
if dkv.Deprecated && kv.Value == "" { if dkv.HiddenIfEmpty && kv.Value == "" {
continue continue
} }
// Do not need to print if state is on // Do not need to print if state is on

View File

@ -31,6 +31,9 @@ const (
Speed = "speed" Speed = "speed"
EnvSpeed = "MINIO_SCANNER_SPEED" EnvSpeed = "MINIO_SCANNER_SPEED"
IdleSpeed = "idle_speed"
EnvIdleSpeed = "MINIO_SCANNER_IDLE_SPEED"
// All below are deprecated in October 2022 and // All below are deprecated in October 2022 and
// replaced them with a single speed parameter // replaced them with a single speed parameter
Delay = "delay" Delay = "delay"
@ -47,6 +50,8 @@ const (
type Config struct { type Config struct {
// Delay is the sleep multiplier. // Delay is the sleep multiplier.
Delay float64 `json:"delay"` Delay float64 `json:"delay"`
// Behavior of the scanner when there is no other parallel S3 requests
IdleMode int32 // 0 => throttling, 1 => full speed
// MaxWait is maximum wait time between operations // MaxWait is maximum wait time between operations
MaxWait time.Duration MaxWait time.Duration
// Cycle is the time.Duration between each scanner cycles // Cycle is the time.Duration between each scanner cycles
@ -59,23 +64,28 @@ var DefaultKVS = config.KVS{
Key: Speed, Key: Speed,
Value: "default", Value: "default",
}, },
// Deprecated Oct 2022
config.KV{ config.KV{
Key: Delay, Key: IdleSpeed,
Value: "", Value: "",
Deprecated: true, HiddenIfEmpty: true,
}, },
// Deprecated Oct 2022 // Deprecated Oct 2022
config.KV{ config.KV{
Key: MaxWait, Key: Delay,
Value: "", Value: "",
Deprecated: true, HiddenIfEmpty: true,
}, },
// Deprecated Oct 2022 // Deprecated Oct 2022
config.KV{ config.KV{
Key: Cycle, Key: MaxWait,
Value: "", Value: "",
Deprecated: true, HiddenIfEmpty: true,
},
// Deprecated Oct 2022
config.KV{
Key: Cycle,
Value: "",
HiddenIfEmpty: true,
}, },
} }
@ -107,6 +117,16 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
default: default:
return cfg, fmt.Errorf("unknown '%s' value", speed) return cfg, fmt.Errorf("unknown '%s' value", speed)
} }
switch idleSpeed := env.Get(EnvIdleSpeed, kvs.GetWithDefault(IdleSpeed, DefaultKVS)); idleSpeed {
case "", "throttled": // Empty is the default mode;
cfg.IdleMode = 0
case "full":
cfg.IdleMode = 1
default:
return cfg, fmt.Errorf("unknown value: '%s'", idleSpeed)
}
return return
} }