MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Include SuccessorModTime for FileInfo quorum (#17732)" (#17860) 

This reverts commit bf3901342c.

This is to fix a regression caused when there are inconsistent
versions, but one version is in quorum. SuccessorModTime issue
must be fixed differently.
This commit is contained in:
Harshavardhana 2023-08-16 07:51:33 -07:00 committed by GitHub
parent 8a9b886011
commit 9ebd10d3f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
set -E set -E
set -o pipefail set -o pipefail
set -x set -x
set -e
WORK_DIR="$PWD/.verify-$RANDOM" WORK_DIR="$PWD/.verify-$RANDOM"
MINIO_CONFIG_DIR="$WORK_DIR/.minio" MINIO_CONFIG_DIR="$WORK_DIR/.minio"

1
cmd/erasure-metadata.go
View File

@ -342,7 +342,6 @@ func findFileInfoInQuorum(ctx context.Context, metaArr []FileInfo, modTime time.
etagOnly := modTime.Equal(timeSentinel) && (etag != "" && etag == meta.Metadata["etag"]) etagOnly := modTime.Equal(timeSentinel) && (etag != "" && etag == meta.Metadata["etag"])
mtimeValid := meta.ModTime.Equal(modTime) mtimeValid := meta.ModTime.Equal(modTime)
if mtimeValid || etagOnly { if mtimeValid || etagOnly {
fmt.Fprint(h, meta.SuccessorModTime.Format(http.TimeFormat))
fmt.Fprintf(h, "%v", meta.XLV1) fmt.Fprintf(h, "%v", meta.XLV1)
if !etagOnly { if !etagOnly {
// Verify dataDir is same only when mtime is valid and etag is not considered. // Verify dataDir is same only when mtime is valid and etag is not considered.