From 9ebd10d3f4e08d2ec449d12e5865d552ff821b64 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 16 Aug 2023 07:51:33 -0700 Subject: [PATCH] Revert "Include SuccessorModTime for FileInfo quorum (#17732)" (#17860) This reverts commit bf3901342cfe00d730edfdef8002fdb2d8bd6750. This is to fix a regression caused when there are inconsistent versions, but one version is in quorum. SuccessorModTime issue must be fixed differently. --- buildscripts/resolve-right-versions.sh | 1 + cmd/erasure-metadata.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/resolve-right-versions.sh b/buildscripts/resolve-right-versions.sh index 5e33b8300..afbdbb1ca 100755 --- a/buildscripts/resolve-right-versions.sh +++ b/buildscripts/resolve-right-versions.sh @@ -3,6 +3,7 @@ set -E set -o pipefail set -x +set -e WORK_DIR="$PWD/.verify-$RANDOM" MINIO_CONFIG_DIR="$WORK_DIR/.minio" diff --git a/cmd/erasure-metadata.go b/cmd/erasure-metadata.go index 7d428fa51..5b24467fc 100644 --- a/cmd/erasure-metadata.go +++ b/cmd/erasure-metadata.go @@ -342,7 +342,6 @@ func findFileInfoInQuorum(ctx context.Context, metaArr []FileInfo, modTime time. etagOnly := modTime.Equal(timeSentinel) && (etag != "" && etag == meta.Metadata["etag"]) mtimeValid := meta.ModTime.Equal(modTime) if mtimeValid || etagOnly { - fmt.Fprint(h, meta.SuccessorModTime.Format(http.TimeFormat)) fmt.Fprintf(h, "%v", meta.XLV1) if !etagOnly { // Verify dataDir is same only when mtime is valid and etag is not considered.