MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-20 10:37:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove active healing on .minio.sys/ during startup (#17072)

Browse Source
This commit is contained in:
Harshavardhana 2023-04-29 02:05:28 -07:00 committed by GitHub
parent 7ae69accc0
commit 02d8f3cdc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/admin-heal-ops.go
View File

@ -784,6 +784,11 @@ func (h *healSequence) healDiskMeta(objAPI ObjectLayer) error {
} }
func (h *healSequence) healItems(objAPI ObjectLayer, bucketsOnly bool) error { func (h *healSequence) healItems(objAPI ObjectLayer, bucketsOnly bool) error {
if h.clientToken == bgHealingUUID {
// For background heal do nothing.
return nil
}
if err := h.healDiskMeta(objAPI); err != nil { if err := h.healDiskMeta(objAPI); err != nil {
return err return err
} }

1
cmd/common-main.go
View File

@ -766,6 +766,7 @@ func handleCommonEnvVars() {
logger.Info(color.RedBold(msg)) logger.Info(color.RedBold(msg))
} }
globalActiveCred = cred globalActiveCred = cred
globalCredViaEnv = true
} else { } else {
globalActiveCred = auth.DefaultCredentials globalActiveCred = auth.DefaultCredentials
} }

6
cmd/config-migrate.go
View File

@ -2531,6 +2531,12 @@ func readConfigWithoutMigrate(ctx context.Context, objAPI ObjectLayer) (config.C
} }
} }
if !globalCredViaEnv && cfg.Credential.IsValid() {
// Preserve older credential if we do not have
// root credentials set via environment variable.
globalActiveCred = cfg.Credential
}
// Init compression config. For future migration, Compression config needs to be copied over from previous version. // Init compression config. For future migration, Compression config needs to be copied over from previous version.
switch cfg.Version { switch cfg.Version {
case "29": case "29":

3
cmd/globals.go
View File

@ -254,6 +254,9 @@ var (
globalActiveCred auth.Credentials globalActiveCred auth.Credentials
// Captures if root credentials are set via ENV.
globalCredViaEnv bool
globalPublicCerts []*x509.Certificate globalPublicCerts []*x509.Certificate
globalDomainNames []string // Root domains for virtual host style requests globalDomainNames []string // Root domains for virtual host style requests