MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: change DISK_ to DRIVE_ for some drive related envs (#18005)

Browse Source
This commit is contained in:
Harshavardhana 2023-09-11 12:19:22 -07:00 committed by GitHub
parent e3fbcaeb72
commit 9878031cfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/background-newdisks-heal-ops.go
View File

@ -347,7 +347,7 @@ func initAutoHeal(ctx context.Context, objAPI ObjectLayer) {
globalBackgroundHealState.pushHealLocalDisks(getLocalDisksToHeal()...) globalBackgroundHealState.pushHealLocalDisks(getLocalDisksToHeal()...)
if env.Get("_MINIO_AUTO_DISK_HEALING", config.EnableOn) == config.EnableOn { if env.Get("_MINIO_AUTO_DRIVE_HEALING", config.EnableOn) == config.EnableOn || env.Get("_MINIO_AUTO_DISK_HEALING", config.EnableOn) == config.EnableOn {
go monitorLocalDisksAndHeal(ctx, z) go monitorLocalDisksAndHeal(ctx, z)
} }
} }

8
cmd/common-main.go
View File

@ -664,10 +664,14 @@ func handleCommonEnvVars() {
logger.Fatal(config.ErrInvalidFSOSyncValue(err), "Invalid MINIO_FS_OSYNC value in environment variable") logger.Fatal(config.ErrInvalidFSOSyncValue(err), "Invalid MINIO_FS_OSYNC value in environment variable")
} }
if rootDiskSize := env.Get(config.EnvRootDiskThresholdSize, ""); rootDiskSize != "" { rootDiskSize := env.Get(config.EnvRootDriveThresholdSize, "")
if rootDiskSize == "" {
rootDiskSize = env.Get(config.EnvRootDiskThresholdSize, "")
}
if rootDiskSize != "" {
size, err := humanize.ParseBytes(rootDiskSize) size, err := humanize.ParseBytes(rootDiskSize)
if err != nil { if err != nil {
logger.Fatal(err, fmt.Sprintf("Invalid %s value in environment variable", config.EnvRootDiskThresholdSize)) logger.Fatal(err, fmt.Sprintf("Invalid %s value in root drive threshold environment variable", rootDiskSize))
} }
globalRootDiskThreshold = size globalRootDiskThreshold = size
} }

13
cmd/xl-storage-disk-id-check.go
View File

@ -725,7 +725,10 @@ var diskMaxTimeout = 2 * time.Minute
var diskActiveMonitoring = true var diskActiveMonitoring = true
func init() { func init() {
s := env.Get("_MINIO_DISK_MAX_CONCURRENT", "") s := env.Get("_MINIO_DRIVE_MAX_CONCURRENT", "")
if s == "" {
s = env.Get("_MINIO_DISK_MAX_CONCURRENT", "")
}
if s != "" { if s != "" {
diskMaxConcurrent, _ = strconv.Atoi(s) diskMaxConcurrent, _ = strconv.Atoi(s)
if diskMaxConcurrent <= 0 { if diskMaxConcurrent <= 0 {
@ -734,7 +737,10 @@ func init() {
} }
} }
d := env.Get("_MINIO_DISK_MAX_TIMEOUT", "") d := env.Get("_MINIO_DRIVE_MAX_TIMEOUT", "")
if d == "" {
d = env.Get("_MINIO_DISK_MAX_TIMEOUT", "")
}
if d != "" { if d != "" {
timeoutOperation, _ := time.ParseDuration(d) timeoutOperation, _ := time.ParseDuration(d)
if timeoutOperation < time.Second { if timeoutOperation < time.Second {
@ -744,7 +750,8 @@ func init() {
} }
} }
diskActiveMonitoring = env.Get("_MINIO_DISK_ACTIVE_MONITORING", config.EnableOn) == config.EnableOn diskActiveMonitoring = (env.Get("_MINIO_DRIVE_ACTIVE_MONITORING", config.EnableOn) == config.EnableOn) ||
(env.Get("_MINIO_DISK_ACTIVE_MONITORING", config.EnableOn) == config.EnableOn)
diskStartChecking = 16 + diskMaxConcurrent/8 diskStartChecking = 16 + diskMaxConcurrent/8
if diskStartChecking > diskMaxConcurrent { if diskStartChecking > diskMaxConcurrent {

3
internal/config/constants.go
View File

@ -63,7 +63,8 @@ const (
EnvMinIOServerURL = "MINIO_SERVER_URL" EnvMinIOServerURL = "MINIO_SERVER_URL"
EnvBrowserRedirectURL = "MINIO_BROWSER_REDIRECT_URL" EnvBrowserRedirectURL = "MINIO_BROWSER_REDIRECT_URL"
EnvRootDiskThresholdSize = "MINIO_ROOTDISK_THRESHOLD_SIZE" EnvRootDriveThresholdSize = "MINIO_ROOTDRIVE_THRESHOLD_SIZE"
EnvRootDiskThresholdSize = "MINIO_ROOTDISK_THRESHOLD_SIZE" // Deprecated Sep 2023
EnvBrowserLoginAnimation = "MINIO_BROWSER_LOGIN_ANIMATION" EnvBrowserLoginAnimation = "MINIO_BROWSER_LOGIN_ANIMATION"
EnvBrowserSessionDuration = "MINIO_BROWSER_SESSION_DURATION" EnvBrowserSessionDuration = "MINIO_BROWSER_SESSION_DURATION"