mirror of
https://github.com/minio/minio.git
synced 2025-01-11 15:03:22 -05:00
fix: remove active healing on .minio.sys/ during startup (#17072)
This commit is contained in:
parent
7ae69accc0
commit
02d8f3cdc8
@ -784,6 +784,11 @@ func (h *healSequence) healDiskMeta(objAPI ObjectLayer) 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 {
|
||||
return err
|
||||
}
|
||||
|
@ -766,6 +766,7 @@ func handleCommonEnvVars() {
|
||||
logger.Info(color.RedBold(msg))
|
||||
}
|
||||
globalActiveCred = cred
|
||||
globalCredViaEnv = true
|
||||
} else {
|
||||
globalActiveCred = auth.DefaultCredentials
|
||||
}
|
||||
|
@ -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.
|
||||
switch cfg.Version {
|
||||
case "29":
|
||||
|
@ -254,6 +254,9 @@ var (
|
||||
|
||||
globalActiveCred auth.Credentials
|
||||
|
||||
// Captures if root credentials are set via ENV.
|
||||
globalCredViaEnv bool
|
||||
|
||||
globalPublicCerts []*x509.Certificate
|
||||
|
||||
globalDomainNames []string // Root domains for virtual host style requests
|
||||
|
Loading…
Reference in New Issue
Block a user