mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-18 13:17:08 +00:00
Chris LuandGitHub
7c252e1f16
* fix(volume): reopen .idx writable after MarkVolumeWritable When .vif has ReadOnly=true, load() opens .idx as O_RDONLY and builds a SortedFileNeedleMap whose Put returns os.ErrInvalid. MarkVolumeWritable only flipped noWriteOrDelete back to false and rewrote .vif, so writes still failed at v.nm.Put. Reopen .idx in O_RDWR and rebuild v.nm in its writable form (in-memory or leveldb small/medium/large) before flipping the flag. Mirror the same fix in seaweed-volume: the Rust load path leaves CompactNeedleMap/RedbNeedleMap with no idx_file writer when the volume boots read-only, so post-MarkVolumeWritable puts silently succeeded in-memory only and were lost on the next restart. set_writable now reattaches an append-mode writer when one is missing. * fix(volume): keep old needle map until replacement is built; defer writable flag Go: build the writable needle map into a local before swapping. A construction failure now leaves v.nm pointing at the original SortedFileNeedleMap so MarkVolumeWritable can roll back, instead of stranding the volume with v.nm == nil. Rust: attach the .idx writer before flipping no_write_or_delete to false. A transient open/metadata failure used to leave the volume marked writable with no writer attached, and subsequent puts would silently skip the on-disk append.
88 lines
3.1 KiB
Go
88 lines
3.1 KiB
Go
package storage
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
)
|
|
|
|
// A volume booted with .vif ReadOnly=true used to come back stuck: load()
|
|
// opens .idx as O_RDONLY and builds a SortedFileNeedleMap whose Put returns
|
|
// os.ErrInvalid, and MarkVolumeWritable only flipped the in-memory flag and
|
|
// rewrote .vif. Subsequent writes failed at v.nm.Put.
|
|
func TestMarkVolumeWritable_ReopensPersistedReadOnly(t *testing.T) {
|
|
dir := t.TempDir()
|
|
|
|
v, err := NewVolume(dir, dir, "", 1, NeedleMapInMemory, &super_block.ReplicaPlacement{}, &needle.TTL{}, 0, needle.GetCurrentVersion(), 0, 0)
|
|
if err != nil {
|
|
t.Fatalf("create volume: %v", err)
|
|
}
|
|
|
|
if _, _, _, err := v.writeNeedle2(newRandomNeedle(1), true, false); err != nil {
|
|
t.Fatalf("initial write: %v", err)
|
|
}
|
|
|
|
// Persist read-only state into .vif, then simulate a server restart by
|
|
// closing and re-opening the volume from the same directory.
|
|
v.PersistReadOnly(true)
|
|
v.Close()
|
|
|
|
v2, err := NewVolume(dir, dir, "", 1, NeedleMapInMemory, &super_block.ReplicaPlacement{}, &needle.TTL{}, 0, needle.GetCurrentVersion(), 0, 0)
|
|
if err != nil {
|
|
t.Fatalf("reload volume: %v", err)
|
|
}
|
|
defer v2.Close()
|
|
|
|
if !v2.noWriteOrDelete {
|
|
t.Fatalf("reloaded volume should be in noWriteOrDelete=true after .vif ReadOnly=true")
|
|
}
|
|
if _, ok := v2.nm.(*SortedFileNeedleMap); !ok {
|
|
t.Fatalf("reloaded readonly volume should use SortedFileNeedleMap, got %T", v2.nm)
|
|
}
|
|
|
|
// Pre-fix behaviour: SortedFileNeedleMap.Put returns os.ErrInvalid even
|
|
// once noWriteOrDelete is cleared. Confirm the failure mode the issue
|
|
// describes — flipping only the flag is not enough.
|
|
v2.noWriteOrDelete = false
|
|
_, _, _, writeErr := v2.writeNeedle2(newRandomNeedle(2), true, false)
|
|
if !errors.Is(writeErr, os.ErrInvalid) {
|
|
t.Fatalf("expected write through SortedFileNeedleMap to fail with os.ErrInvalid, got %v", writeErr)
|
|
}
|
|
v2.noWriteOrDelete = true // restore so reopenIdxForWrite reflects the real entry condition
|
|
|
|
if err := v2.reopenIdxForWrite(); err != nil {
|
|
t.Fatalf("reopenIdxForWrite: %v", err)
|
|
}
|
|
if _, stillSorted := v2.nm.(*SortedFileNeedleMap); stillSorted {
|
|
t.Fatalf("reopenIdxForWrite left SortedFileNeedleMap in place")
|
|
}
|
|
|
|
v2.noWriteOrDelete = false
|
|
if _, _, _, err := v2.writeNeedle2(newRandomNeedle(3), true, false); err != nil {
|
|
t.Fatalf("write after reopen: %v", err)
|
|
}
|
|
}
|
|
|
|
// reopenIdxForWrite must be a no-op when the volume already has a writable
|
|
// needle map — otherwise repeated MarkVolumeWritable calls would churn the
|
|
// index file handle for no reason.
|
|
func TestReopenIdxForWrite_NoopWhenAlreadyWritable(t *testing.T) {
|
|
dir := t.TempDir()
|
|
v, err := NewVolume(dir, dir, "", 2, NeedleMapInMemory, &super_block.ReplicaPlacement{}, &needle.TTL{}, 0, needle.GetCurrentVersion(), 0, 0)
|
|
if err != nil {
|
|
t.Fatalf("create volume: %v", err)
|
|
}
|
|
defer v.Close()
|
|
|
|
before := v.nm
|
|
if err := v.reopenIdxForWrite(); err != nil {
|
|
t.Fatalf("reopenIdxForWrite on writable volume: %v", err)
|
|
}
|
|
if v.nm != before {
|
|
t.Fatalf("reopenIdxForWrite replaced nm on a writable volume (before=%p after=%p)", before, v.nm)
|
|
}
|
|
}
|