maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not heal "backend-encrypted" out-of-band with migration (#12556)

Browse source 
backend-encrypted doesn't need to be explicitly healed anymore
since this file is deleted upon upgrade and migration to the
KMS based encrypted config/IAM credentials.
This commit is contained in:
Harshavardhana 2021-06-23 12:09:10 -07:00 committed by GitHub
parent f13f3344df
commit b4bf82c751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildscripts/verify-healing.sh
View file

@ -67,7 +67,7 @@ function start_minio_3_node() {
function check_online() {
if grep -q 'Server switching to safe mode' ${WORK_DIR}/dist-minio-*.log; then
if grep -q 'Unable to initialize sub-systems' ${WORK_DIR}/dist-minio-*.log; then
echo "1"
fi
}

10
cmd/admin-heal-ops.go
View file

@ -819,16 +819,6 @@ func (h *healSequence) healFromSourceCh() {
}
func (h *healSequence) healDiskMeta(objAPI ObjectLayer) error {
// Try to pro-actively heal backend-encrypted file.
if err := h.queueHealTask(healSource{
bucket: minioMetaBucket,
object: backendEncryptedFile,
}, madmin.HealItemBucketMetadata); err != nil {
if !isErrObjectNotFound(err) && !isErrVersionNotFound(err) {
return err
}
}
// Start healing the config prefix.
return h.healMinioSysMeta(objAPI, minioConfigPrefix)()
}

2
cmd/config-encrypted.go
View file

@ -183,5 +183,5 @@ func migrateConfigPrefixToEncrypted(objAPI ObjectLayer, encrypted bool) error {
if encrypted && GlobalKMS != nil {
logger.Info("Migration of encrypted config data completed. All config data is now encrypted.")
}
return deleteConfig(GlobalContext, globalObjectAPI, backendEncryptedFile)
return deleteConfig(GlobalContext, objAPI, backendEncryptedFile)
}

7
cmd/global-heal.go
View file

@ -158,13 +158,6 @@ func (er *erasureObjects) healErasureSet(ctx context.Context, buckets []BucketIn
Name: pathJoin(minioMetaBucket, minioConfigPrefix),
})
// Try to pro-actively heal backend-encrypted file.
if _, err := er.HealObject(ctx, minioMetaBucket, backendEncryptedFile, "", madmin.HealOpts{}); err != nil {
if !isErrObjectNotFound(err) && !isErrVersionNotFound(err) {
logger.LogIf(ctx, err)
}
}
// Heal all buckets with all objects
for _, bucket := range buckets {
if tracker.isHealed(bucket.Name) {