mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-06 14:31:57 +02:00
* volume: merge .ecj as a set union on EC shard copy + index recovery (Rust+Go) An EC volume's deletion journal is a set of needle ids, but shard copy and index recovery appended the peer's whole journal, doubling the file on every ec_balance round trip. Fold the peer's ids in as a union instead: only ids the local journal lacks are appended. - The journal is never replaced. A mounted EcVolume merges a peer's ids through its live handle under the lock deletes take (Go MergeJournal / Rust merge_journal), wherever its journal lives. - An unmounted journal gets only the missing ids appended while mounts are excluded; the delta is read outside the lock and re-read if the journal changed. - The source .ecj streams into memory as an id set: no staging files, chunked reads, memory proportional to distinct ids. - Go and Rust agree that a source journal exists when it sends a modified time or any bytes. A missing source stays a no-op. - Rust runs every merge in spawn_blocking and shares one receive/merge path between shard copy and index recovery. The decode path and the journal format are unchanged. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: route .ecj merges to the runtime that holds the journal open Disks sharing one index directory all resolved as the journal's owner, so the last one won and a sibling's mounted runtime was skipped: the merge appended behind its open handle and the sibling kept serving the peer's deleted needles until remount. Callers now name the receiving disk by its data directory; the merge goes through that disk's runtime, else a sibling runtime whose journal is the target file. In Go the unmounted append now holds every disk's EC lock (in location order) while it rechecks for a mount, so a sibling mounting from this disk's index during the unlocked read is merged through instead. In Rust a mount that lands during the read is merged through directly and its added count returned, rather than discarded and reported as zero. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: sync merged .ecj records outside the disks' EC locks The unmounted merge held every disk's EC read lock across its fsync, so a slow sync on one disk held off mounts on all of them, along with the EC reads queued behind those mounts. Mounts only need to be excluded while the records are written: the write now happens under the locks and the fsync after they are released, since a later mount reads the written records from the page cache. A failed fsync rolls back only if nothing has mounted the journal or appended to it since the write. A merge through a mounted volume now keeps only that volume's disk locked across its fsync. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: roll back an unsynced .ecj merge through a volume mounted mid-sync If a volume mounted after the unmounted merge wrote its records but before the fsync failed, the rollback kept the records because the journal was now open, leaving ids in the volume's deleted set that may never reach disk; a retried merge then saw them and synced nothing. The rollback now goes through that volume the way its own failed journal fsync does: truncate back and drop the ids from the in-memory set, so a retry appends and syncs them again. It still keeps the records if the volume journaled since, as truncating would lose that delete. No fsync runs under the disk locks. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: decide .ecj merge rollback from the journal's actual length Two runtimes can hold one journal (cross-disk mounts). The rollback of an unsynced merge checked one runtime's cached ecjFileSize, which another runtime's appends leave stale, so it could truncate a delete that runtime had already synced. The rollback now holds every holder's journal lock and truncates only if the file's actual length is still the append's end, then updates each holder's size and deleted set. Otherwise later records follow the merged ones, so they stay and are rewritten in place and synced outside the locks, rather than left possibly not durable. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: keep unsynced .ecj merge ids out of mounted deleted sets When a merge's fsync failed, later records blocked the rollback, and the rewrite-and-sync failed as well, the merged ids stayed in every mounted volume's deleted set without being shown durable, so a retried merge saw them as present and synced nothing. They now leave those sets while the records stay in the file, matching DeleteNeedleFromEcx, which publishes an id only after its record syncs. The merge returns the error and a retry appends and syncs them again. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume: publish merged .ecj ids to every holder of the journal Two runtimes can journal into the same file when disks share an index directory. The merge went through only the first holder, leaving a sibling's in-memory deleted set without the ids, so it could keep serving a needle the peer deleted until it remounted. Every holder of the journal now gets the merged ids, in Go and in the volume server. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * Publish merged .ecj ids to the journal actually written mountedEcJournal prefers the receiving disk's own runtime for the vid, whose journal may live in its data directory while the copied records name a sibling's journal in the index directory. Publishing by the requested ecjPath then marked a holder of a different file deleted on records that file never persisted, resurrecting the needles on remount. Publish by the picked runtime's journal path instead. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
177 lines
5.5 KiB
Go
177 lines
5.5 KiB
Go
package erasure_coding
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
var (
|
|
MarkNeedleDeleted = func(file *os.File, offset int64) error {
|
|
b := make([]byte, types.SizeSize)
|
|
types.SizeToBytes(b, types.TombstoneFileSize)
|
|
n, err := file.WriteAt(b, offset+types.NeedleIdSize+types.OffsetSize)
|
|
if err != nil {
|
|
return fmt.Errorf("sorted needle write error: %w", err)
|
|
}
|
|
if n != types.SizeSize {
|
|
return fmt.Errorf("sorted needle written %d bytes, expecting %d", n, types.SizeSize)
|
|
}
|
|
return nil
|
|
}
|
|
)
|
|
|
|
// DeleteNeedleFromEcx marks the given needle as deleted. .ecx is treated
|
|
// as an immutable sealed sorted index; runtime deletes are recorded by
|
|
// appending the needle id to the .ecj deletion journal and inserting it
|
|
// into the in-memory deletedNeedles set. A subsequent FindNeedleFromEcx
|
|
// masks the id out by returning TombstoneFileSize.
|
|
//
|
|
// The .ecj append is the durable commit point — only after it syncs do
|
|
// we publish the id into the in-memory set. A partial write is truncated
|
|
// back to the known-good size so the on-disk journal and the set cannot
|
|
// drift.
|
|
func (ev *EcVolume) DeleteNeedleFromEcx(needleId types.NeedleId) (err error) {
|
|
|
|
// Look the needle up read-only. A missing needle is not an error
|
|
// (already gone, e.g. from a race against encode); a pre-existing
|
|
// .ecx tombstone means a prior decode/rebuild folded it in, in
|
|
// which case there is nothing to journal but we still mirror it
|
|
// into the in-memory set so delete_count stays consistent.
|
|
_, oldSize, err := SearchNeedleFromSortedIndex(ev.ecxFile, ev.ecxFileSize, needleId, nil)
|
|
if err != nil {
|
|
if err == NotFoundError {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
if oldSize.IsDeleted() {
|
|
ev.markNeedleDeletedInMemory(needleId)
|
|
return nil
|
|
}
|
|
|
|
// Serialise runtime deletes on ecjFileAccessLock so the idempotence
|
|
// check, the journal append and the set insertion happen atomically
|
|
// with respect to one another.
|
|
ev.ecjFileAccessLock.Lock()
|
|
defer ev.ecjFileAccessLock.Unlock()
|
|
|
|
if ev.IsNeedleDeleted(needleId) {
|
|
return nil
|
|
}
|
|
|
|
// Close nils ecjFile under this same lock, so a delete that resolved its
|
|
// .ecx lookup before an eviction (e.g. the generate-time UnloadEcVolume)
|
|
// can reach here with no journal fd. Bail with a clear error rather than
|
|
// operating on the closed/nil handle.
|
|
if ev.ecjFile == nil {
|
|
return fmt.Errorf("ec volume %d closed", ev.VolumeId)
|
|
}
|
|
|
|
b := make([]byte, types.NeedleIdSize)
|
|
types.NeedleIdToBytes(b, needleId)
|
|
if err := ev.appendJournalLocked(b); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Publish into the in-memory set only after the journal is durable.
|
|
ev.markNeedleDeletedInMemory(needleId)
|
|
|
|
return nil
|
|
}
|
|
|
|
// appendJournalLocked appends whole records to .ecj and syncs them. A partial
|
|
// write is truncated back to the known-good size so the on-disk journal and
|
|
// deletedNeedles cannot drift. Callers hold ecjFileAccessLock and have checked
|
|
// that ecjFile is open.
|
|
func (ev *EcVolume) appendJournalLocked(b []byte) error {
|
|
prevEcjSize := ev.ecjFileSize
|
|
if _, seekErr := ev.ecjFile.Seek(0, io.SeekEnd); seekErr != nil {
|
|
return fmt.Errorf("seek ecj: %w", seekErr)
|
|
}
|
|
n, writeErr := ev.ecjFile.Write(b)
|
|
if writeErr != nil {
|
|
if truncErr := ev.ecjFile.Truncate(prevEcjSize); truncErr != nil {
|
|
glog.Errorf("ec volume %d: failed to truncate ecj after write error: %v", ev.VolumeId, truncErr)
|
|
}
|
|
return fmt.Errorf("write ecj: %w", writeErr)
|
|
}
|
|
if syncErr := ev.ecjFile.Sync(); syncErr != nil {
|
|
if truncErr := ev.ecjFile.Truncate(prevEcjSize); truncErr != nil {
|
|
glog.Errorf("ec volume %d: failed to truncate ecj after sync error: %v", ev.VolumeId, truncErr)
|
|
}
|
|
return fmt.Errorf("sync ecj: %w", syncErr)
|
|
}
|
|
ev.ecjFileSize += int64(n)
|
|
return nil
|
|
}
|
|
|
|
func RebuildEcxFile(baseFileName string) error {
|
|
|
|
if !util.FileExists(baseFileName + ".ecj") {
|
|
return nil
|
|
}
|
|
|
|
ecxFile, err := os.OpenFile(baseFileName+".ecx", os.O_RDWR, 0644)
|
|
if err != nil {
|
|
return fmt.Errorf("rebuild: failed to open ecx file: %w", err)
|
|
}
|
|
defer ecxFile.Close()
|
|
|
|
fstat, err := ecxFile.Stat()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ecxFileSize := fstat.Size()
|
|
|
|
ecjFile, err := os.OpenFile(baseFileName+".ecj", os.O_RDWR, 0644)
|
|
if err != nil {
|
|
return fmt.Errorf("rebuild: failed to open ecj file: %w", err)
|
|
}
|
|
defer ecjFile.Close()
|
|
|
|
buf := make([]byte, types.NeedleIdSize)
|
|
for {
|
|
// io.ReadFull distinguishes a clean end (io.EOF) from a torn tail
|
|
// (io.ErrUnexpectedEOF) and a transient short read; a bare n!=size
|
|
// break would silently drop the rest of the journal and then unlink it.
|
|
_, readErr := io.ReadFull(ecjFile, buf)
|
|
if readErr == io.EOF {
|
|
break
|
|
}
|
|
if readErr != nil {
|
|
// Torn or unreadable journal: abort and leave .ecj in place so a
|
|
// retry can re-apply the deletions rather than resurrect them.
|
|
return fmt.Errorf("rebuild: read ecj: %w", readErr)
|
|
}
|
|
|
|
needleId := types.BytesToNeedleId(buf)
|
|
|
|
_, _, err = SearchNeedleFromSortedIndex(ecxFile, ecxFileSize, needleId, MarkNeedleDeleted)
|
|
|
|
if err != nil && err != NotFoundError {
|
|
return err
|
|
}
|
|
|
|
}
|
|
|
|
// Flush the in-place tombstones before removing the journal; otherwise a
|
|
// crash can persist the .ecj unlink ahead of the .ecx writes and resurrect
|
|
// the deleted needles on the next load.
|
|
if err = ecxFile.Sync(); err != nil {
|
|
return fmt.Errorf("rebuild: sync ecx: %w", err)
|
|
}
|
|
|
|
// Close the journal before unlinking it (Windows cannot delete an open
|
|
// file); the deferred Close becomes a harmless no-op.
|
|
ecjFile.Close()
|
|
os.Remove(baseFileName + ".ecj")
|
|
|
|
return nil
|
|
}
|