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

allow healing to prefer local disks over remote (#17788)

Browse Source
This commit is contained in:
Harshavardhana 2023-08-03 02:18:18 -07:00 committed by GitHub
parent 4a4950fe41
commit 45fb375c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/erasure-decode.go
View File

@ -289,12 +289,15 @@ func (e Erasure) Decode(ctx context.Context, writer io.Writer, readers []io.Read
} }
// Heal reads from readers, reconstruct shards and writes the data to the writers. // Heal reads from readers, reconstruct shards and writes the data to the writers.
func (e Erasure) Heal(ctx context.Context, writers []io.Writer, readers []io.ReaderAt, totalLength int64) (derr error) { func (e Erasure) Heal(ctx context.Context, writers []io.Writer, readers []io.ReaderAt, totalLength int64, prefer []bool) (derr error) {
if len(writers) != e.parityBlocks+e.dataBlocks { if len(writers) != e.parityBlocks+e.dataBlocks {
return errInvalidArgument return errInvalidArgument
} }
reader := newParallelReader(readers, e, 0, totalLength) reader := newParallelReader(readers, e, 0, totalLength)
if len(readers) == len(prefer) {
reader.preferReaders(prefer)
}
startBlock := int64(0) startBlock := int64(0)
endBlock := totalLength / e.blockSize endBlock := totalLength / e.blockSize

2
cmd/erasure-heal_test.go
View File

@ -132,7 +132,7 @@ func TestErasureHeal(t *testing.T) {
} }
// test case setup is complete - now call Heal() // test case setup is complete - now call Heal()
err = erasure.Heal(context.Background(), staleWriters, readers, test.size) err = erasure.Heal(context.Background(), staleWriters, readers, test.size, nil)
closeBitrotReaders(readers) closeBitrotReaders(readers)
closeBitrotWriters(staleWriters) closeBitrotWriters(staleWriters)
if err != nil && !test.shouldFail { if err != nil && !test.shouldFail {

5
cmd/erasure-healing.go
View File

@ -661,6 +661,7 @@ func (er *erasureObjects) healObject(ctx context.Context, bucket string, object
partChecksums := latestMeta.Parts[partIndex].Checksums partChecksums := latestMeta.Parts[partIndex].Checksums
tillOffset := erasure.ShardFileOffset(0, partSize, partSize) tillOffset := erasure.ShardFileOffset(0, partSize, partSize)
readers := make([]io.ReaderAt, len(latestDisks)) readers := make([]io.ReaderAt, len(latestDisks))
prefer := make([]bool, len(latestDisks))
checksumAlgo := erasureInfo.GetChecksumInfo(partNumber).Algorithm checksumAlgo := erasureInfo.GetChecksumInfo(partNumber).Algorithm
for i, disk := range latestDisks { for i, disk := range latestDisks {
if disk == OfflineDisk { if disk == OfflineDisk {
@ -670,6 +671,8 @@ func (er *erasureObjects) healObject(ctx context.Context, bucket string, object
partPath := pathJoin(object, srcDataDir, fmt.Sprintf("part.%d", partNumber)) partPath := pathJoin(object, srcDataDir, fmt.Sprintf("part.%d", partNumber))
readers[i] = newBitrotReader(disk, copyPartsMetadata[i].Data, bucket, partPath, tillOffset, checksumAlgo, readers[i] = newBitrotReader(disk, copyPartsMetadata[i].Data, bucket, partPath, tillOffset, checksumAlgo,
checksumInfo.Hash, erasure.ShardSize()) checksumInfo.Hash, erasure.ShardSize())
prefer[i] = disk.Hostname() == ""
} }
writers := make([]io.Writer, len(outDatedDisks)) writers := make([]io.Writer, len(outDatedDisks))
for i, disk := range outDatedDisks { for i, disk := range outDatedDisks {
@ -689,7 +692,7 @@ func (er *erasureObjects) healObject(ctx context.Context, bucket string, object
// Heal each part. erasure.Heal() will write the healed // Heal each part. erasure.Heal() will write the healed
// part to .minio/tmp/uuid/ which needs to be renamed // part to .minio/tmp/uuid/ which needs to be renamed
// later to the final location. // later to the final location.
err = erasure.Heal(ctx, writers, readers, partSize) err = erasure.Heal(ctx, writers, readers, partSize, prefer)
closeBitrotReaders(readers) closeBitrotReaders(readers)
closeBitrotWriters(writers) closeBitrotWriters(writers)
if err != nil { if err != nil {