mirrors/minio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: always prefer DataBlocks present in FileInfo (#12386)

Browse Source
This commit is contained in:
Harshavardhana
2021-05-27 10:11:50 -07:00
committed by GitHub
parent 530b703902
commit b5ebfd35b4
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/erasure-healing.go
View File

@@ -778,7 +778,10 @@ func (er erasureObjects) purgeObjectDangling(ctx context.Context, bucket, object
if m.Erasure.ParityBlocks == 0 { if m.Erasure.ParityBlocks == 0 {
parityBlocks = er.defaultParityCount parityBlocks = er.defaultParityCount
} }
dataBlocks := len(storageDisks) - parityBlocks dataBlocks := m.Erasure.DataBlocks
if m.Erasure.DataBlocks == 0 {
dataBlocks = len(storageDisks) - parityBlocks
}
writeQuorum := dataBlocks writeQuorum := dataBlocks
if dataBlocks == parityBlocks { if dataBlocks == parityBlocks {
writeQuorum++ writeQuorum++

6
cmd/erasure-metadata.go
View File

@@ -344,7 +344,11 @@ func objectQuorumFromMeta(ctx context.Context, partsMetaData []FileInfo, errs []
parityBlocks = defaultParityCount parityBlocks = defaultParityCount
} }
dataBlocks := len(partsMetaData) - parityBlocks dataBlocks := latestFileInfo.Erasure.DataBlocks
if dataBlocks == 0 {
dataBlocks = len(partsMetaData) - parityBlocks
}
writeQuorum := dataBlocks writeQuorum := dataBlocks
if dataBlocks == parityBlocks { if dataBlocks == parityBlocks {
writeQuorum++ writeQuorum++