astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-11-12 02:25:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(restore): ignore derived data-dir flag in revision identity

Browse Source 
Keep restored versions consistent across expiry and successive heals while preserving metadata, layout and non-object revision distinctions.

Fixes #344

Signed-off-by: Feng Ruohang <rh@vonng.com>
This commit is contained in:
Feng Ruohang
2026-11-11 12:32:11 +08:00
parent a8824b341f
commit b5d97e3e1f
5 changed files with 165 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/erasure-server-pool-lifecycle-authority_test.go
+8 -4
View File
@@ -696,8 +696,10 @@ func TestPoolsLifecycleHeaderEras(t *testing.T) {
if versionRevision(old(0), xlMetaVersion) != versionRevision(current(7), xlMetaVersion) {
t.Error("one version under the headers of two releases has two keys")
}
// The header of the key orders the merge: it is the current one.
if versionRevision(old(0), xlMetaVersion).header != current(0).header {
// The normalized current header orders the merge.
wantHeader := current(0).header
wantHeader.Flags &^= xlFlagUsesDataDir
if versionRevision(old(0), xlMetaVersion).header != wantHeader {
t.Error("the key does not carry the header of the current release")
}
for healed := range 17 {
@@ -753,8 +755,10 @@ func TestPoolsLifecycleHealedOldHeaders(t *testing.T) {
rewriteTierTestMeta(t, disk, s.bucket, key, func(xl *xlMetaV2) {
for i := range xl.versions {
// Control: the key of a version this release wrote
// carries its header as stored.
if versionRevision(xl.versions[i], xl.metaV).header != xl.versions[i].header {
// carries its header with only the time-derived flag removed.
wantHeader := xl.versions[i].header
wantHeader.Flags &^= xlFlagUsesDataDir
if versionRevision(xl.versions[i], xl.metaV).header != wantHeader {
t.Fatal("the key of a current version carries another header")
}
xl.versions[i].header.EcN, xl.versions[i].header.EcM = 0, 0