MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-07-17 12:42:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

heal multiple buckets in parallel

Browse Source
This commit is contained in:
Harshavardhana 2021-02-01 20:20:12 -08:00
parent 745a4b31ba
commit fa1cd6dcce
3 changed files with 59 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/admin-handlers.go
View File

@ -780,7 +780,8 @@ func (a adminAPIHandlers) HealSetsHandler(w http.ResponseWriter, r *http.Request
go func(setNumber int) { go func(setNumber int) {
defer wg.Done() defer wg.Done()
lbDisks := z.serverSets[0].sets[setNumber].getOnlineDisks() lbDisks := z.serverSets[0].sets[setNumber].getOnlineDisks()
if err := healErasureSet(ctx, setNumber, opts.sleepForIO, opts.sleepDuration, buckets, lbDisks); err != nil { setDriveCount := z.SetDriveCount()
if err := healErasureSet(ctx, setNumber, setDriveCount, opts.sleepForIO, opts.sleepDuration, buckets, lbDisks); err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
} }
}(setNumber) }(setNumber)

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

@ -168,7 +168,8 @@ func monitorLocalDisksAndHeal(ctx context.Context, z *erasureServerSets, bgSeq *
logger.Info("Healing disk '%s' on %s zone", disk, humanize.Ordinal(i+1)) logger.Info("Healing disk '%s' on %s zone", disk, humanize.Ordinal(i+1))
lbDisks := z.serverSets[i].sets[setIndex].getOnlineDisks() lbDisks := z.serverSets[i].sets[setIndex].getOnlineDisks()
if err := healErasureSet(ctx, setIndex, 10, time.Second, buckets, lbDisks); err != nil { setDriveCount := z.SetDriveCount()
if err := healErasureSet(ctx, setIndex, setDriveCount, 10, time.Second, buckets, lbDisks); err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
continue continue
} }

28
cmd/global-heal.go
View File

@ -98,7 +98,7 @@ func getLocalBackgroundHealStatus() (madmin.BgHealState, bool) {
} }
// healErasureSet lists and heals all objects in a specific erasure set // healErasureSet lists and heals all objects in a specific erasure set
func healErasureSet(ctx context.Context, setIndex int, maxIO int, maxSleep time.Duration, buckets []BucketInfo, disks []StorageAPI) error { func healErasureSet(ctx context.Context, setIndex int, setDriveCount int, maxIO int, maxSleep time.Duration, buckets []BucketInfo, disks []StorageAPI) error {
// Get background heal sequence to send elements to heal // Get background heal sequence to send elements to heal
var bgSeq *healSequence var bgSeq *healSequence
var ok bool var ok bool
@ -128,7 +128,12 @@ func healErasureSet(ctx context.Context, setIndex int, maxIO int, maxSleep time.
}) // add metadata .minio.sys/ bucket prefixes to heal }) // add metadata .minio.sys/ bucket prefixes to heal
// Heal all buckets with all objects // Heal all buckets with all objects
var wg sync.WaitGroup
for _, bucket := range buckets { for _, bucket := range buckets {
wg.Add(1)
go func(bucket BucketInfo, disks []StorageAPI) {
defer wg.Done()
// Heal current bucket // Heal current bucket
bgSeq.sourceCh <- healSource{ bgSeq.sourceCh <- healSource{
bucket: bucket.Name, bucket: bucket.Name,
@ -136,12 +141,11 @@ func healErasureSet(ctx context.Context, setIndex int, maxIO int, maxSleep time.
var entryChs []FileInfoVersionsCh var entryChs []FileInfoVersionsCh
var mu sync.Mutex var mu sync.Mutex
var wg sync.WaitGroup var wwg sync.WaitGroup
for _, disk := range disks { for _, disk := range disks {
disk := disk wwg.Add(1)
wg.Add(1) go func(disk StorageAPI) {
go func() { defer wwg.Done()
defer wg.Done()
entryCh, err := disk.WalkVersions(ctx, bucket.Name, "", "", true, ctx.Done()) entryCh, err := disk.WalkVersions(ctx, bucket.Name, "", "", true, ctx.Done())
if err != nil { if err != nil {
// Disk walk returned error, ignore it. // Disk walk returned error, ignore it.
@ -152,19 +156,23 @@ func healErasureSet(ctx context.Context, setIndex int, maxIO int, maxSleep time.
Ch: entryCh, Ch: entryCh,
}) })
mu.Unlock() mu.Unlock()
}() }(disk)
} }
wg.Wait() wwg.Wait()
entriesValid := make([]bool, len(entryChs)) entriesValid := make([]bool, len(entryChs))
entries := make([]FileInfoVersions, len(entryChs)) entries := make([]FileInfoVersions, len(entryChs))
for { for {
entry, _, ok := lexicallySortedEntryVersions(entryChs, entries, entriesValid) entry, quorumCount, ok := lexicallySortedEntryVersions(entryChs, entries, entriesValid)
if !ok { if !ok {
break break
} }
if quorumCount == setDriveCount {
continue
}
for _, version := range entry.Versions { for _, version := range entry.Versions {
hsrc := healSource{ hsrc := healSource{
bucket: bucket.Name, bucket: bucket.Name,
@ -180,7 +188,9 @@ func healErasureSet(ctx context.Context, setIndex int, maxIO int, maxSleep time.
} }
} }
} }
}(bucket, disks)
} }
wg.Wait()
return nil return nil
} }