MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-20 10:37:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: regression in resolving the right versions (#15430)

Browse Source 
fix: regression in resolving right versions

commit d480022711 caused a regression in real
resolver, by picking up incorrect versionID.
This commit is contained in:
Harshavardhana 2022-07-29 10:03:53 -07:00 committed by GitHub
parent 8ec888d13d
commit aa874010e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/resolve-right-versions.sh
View File

@ -39,7 +39,7 @@ function start_minio_5drive() {
"${MINIO[@]}" --address ":$start_port" "${WORK_DIR}/cicd-corpus/disk{1...5}" > "${WORK_DIR}/server1.log" 2>&1 & "${MINIO[@]}" --address ":$start_port" "${WORK_DIR}/cicd-corpus/disk{1...5}" > "${WORK_DIR}/server1.log" 2>&1 &
pid=$! pid=$!
disown $pid disown $pid
sleep 30 sleep 5
if ! ps -p ${pid} 1>&2 >/dev/null; then if ! ps -p ${pid} 1>&2 >/dev/null; then
echo "server1 log:" echo "server1 log:"

19
cmd/erasure-object.go
View File

@ -534,6 +534,11 @@ func readAllXL(ctx context.Context, disks []StorageAPI, bucket, object string, r
return metaFileInfos, errs return metaFileInfos, errs
} }
versionID := lfi.VersionID
if versionID == "" {
versionID = nullVersionID
}
for index := range metadataArray { for index := range metadataArray {
if metadataArray[index] == nil { if metadataArray[index] == nil {
continue continue
@ -541,21 +546,15 @@ func readAllXL(ctx context.Context, disks []StorageAPI, bucket, object string, r
// make sure to preserve this for diskmtime based healing bugfix. // make sure to preserve this for diskmtime based healing bugfix.
diskMTime := metaFileInfos[index].DiskMTime diskMTime := metaFileInfos[index].DiskMTime
metaFileInfos[index], errs[index] = metadataArray[index].ToFileInfo(bucket, object, "") metaFileInfos[index], errs[index] = metadataArray[index].ToFileInfo(bucket, object, versionID)
if errs[index] != nil { if errs[index] != nil {
continue continue
} }
if metaFileInfos[index].IsValid() && metaFileInfos[index].ModTime.Equal(lfi.ModTime) { if readData {
versionID := metaFileInfos[index].VersionID metaFileInfos[index].Data = metadataArray[index].data.find(versionID)
if versionID == "" {
versionID = nullVersionID
}
if readData {
metaFileInfos[index].Data = metadataArray[index].data.find(versionID)
}
metaFileInfos[index].DiskMTime = diskMTime
} }
metaFileInfos[index].DiskMTime = diskMTime
} }
// Return all the metadata. // Return all the metadata.