mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-06 14:31:57 +02:00
* volume server: ec.decode reads the .ecx from the index dir it was copied to VolumeEcShardsCopy writes the .ecx/.ecj into the receiver's -dir.idx, so with a split data/index dir the decode target has no .ecx beside its shards. VolumeEcShardsToVolume sized the .dat from the right .ecx but built the .idx from the data dir, failing with NotFound after the .dat was already published. It now reads .ecx/.ecj from where the EC volume opened them and writes the .idx beside the .dat, where Go leaves it. The live-entry check and the .dat size also ignored deletions recorded only in the .ecj, which Go folds into the .ecx (RebuildEcxFile) first: a fully deleted volume was decoded instead of reported as having no live entries, and deleted tail needles were copied into the .dat. Both now treat journaled ids as deleted, without rewriting the sealed .ecx. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode keeps the decoded volume writable and reads every .ecj The rebuilt .idx copied a journaled tail needle's .ecx row verbatim after the .dat was cut short before it, so the mount saw a row past EOF and marked the decoded volume read-only. Rows of deleted needles the .dat no longer holds are now dropped, and each journaled needle still in the .dat gets one tombstone instead of one per journal entry. VolumeEcShardsCopy appends journals collected from other holders into the idx dir, but the decode read only the .ecj beside the .ecx, which sits in the data dir when this server generated the shards. It now reads both, once, in bounded chunks via the loader EcVolume uses. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: test ec.decode drops a sealed .ecx tail tombstone Covers the other half of the rule added in the previous commit: a tail needle tombstoned in the .ecx itself (Go's RebuildEcxFile) is cut from the .dat, and its row must not reach the rebuilt .idx either. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode runs its file I/O off the async runtime VolumeEcShardsToVolume released the store lock before decoding, but read the .ecx/.ecj, rebuilt the .dat and wrote the .idx inside the async handler, parking a runtime worker for the length of a volume-sized copy. The decode now runs in spawn_blocking on inputs snapshotted under the store lock. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode checks the rebuilt .dat is complete Go stats the decoded .dat before writing the .idx (VerifyDecodedDatFile) and fails the decode when it is shorter than the extent the EC index references, since the caller deletes the shards once the call returns. The Rust handler returned success without that check. The rebuild already fails on a short shard read, so this guards the published file itself. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode drops the decoded volume's bitrot sidecars Go removes <base>.ecsum and <base>.ecsum.v<N> beside the .dat and beside the .ecx once the .idx is written, so a stale checksum sidecar cannot pass for the protection of a later re-encode. The Rust handler left them in place. Removal is best effort, as in Go. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode compacts the decoded volume Go ends VolumeEcShardsToVolume with an offline CompactVolumeFiles, so the decoded volume holds only live needles. The Rust decode left every needle deleted through the .ecj in the .dat, tombstoned in the .idx, until a later vacuum reclaimed it. Store::compact_volume_files loads the unmounted volume, checks free space the way the vacuum does (the estimate now lives in one helper), and runs the vacuum's compact-by-index and commit. As in Go a failed compaction is logged and the decode still succeeds, so the uncompacted .idx rules stay: the tests that pin them now make the compaction fail. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * volume server: ec.decode keeps deletes journaled while the .dat is written The decode read the .ecj journals once, before rebuilding the .dat, so a delete that reached the EC volume during the rebuild was left out of the new .idx and the needle came back live. Each journal's read length is now kept, and the bytes appended since are read just before the .idx is written, after waiting out any journal append in flight (appends hold the store write lock), so every delete acknowledged by then is in the .idx. A delete after that point is still lost, as in Go. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> * Guard overlapping ec decode requests; serialize journal catch-up volume_ec_shards_to_volume runs its decode in spawn_blocking, so a dropped request leaves the job running and a retry would race it on the temporary and final volume files. Claim the vid in a per-server in-flight set until the blocking job finishes, and return Unavailable to an overlapping request. The Go handler has the same exposure and gets the same guard. Journal appends hold the store write lock through their sync-or-truncate, so holding a read lock across the catch-up read guarantees every record it sees is committed: a rolled-back delete can no longer leave a tombstone in the decoded index. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * Reconcile the swap when offline compaction commit fails A CommitCompact that fails after the .cpc marker may have renamed .dat but not .idx. cleanup_compact refuses while the marker exists, so the mismatched pair survived until a restart reconciled it — and the decode caller treats the failure as non-fatal. Run reconcileCompactState on commit failure so a decided swap rolls forward and orphan temps are removed before the volume can mount. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * Release the decode claim on panic * volume: add ec_decodes_in_flight to the integration-test state literal * volume server: hold the decode tail's lock through compaction The catch_up read released before the rebuilt .idx was written and the volume compacted, so a delete synced to .ecj in that window was durably journaled yet absent from the published index — resurrecting the needle. Rust now holds the store read lock from catch_up through compact, and Go mirrors it by holding the volume's journal lock from the journal- consuming index write through CompactVolumeFiles. * volume server: serialize ec decode's tail per volume, not per store Review follow-ups on the decode path: - Rust: holding the store read lock from journal catch-up through the offline compaction stalled every writer on unrelated volumes for the whole rewrite. The new ec_decode_tail set marks the vid only while its .idx is published and .cpd/.cpx swapped; the two local .ecj append paths (VolumeEcBlobDelete, the distributed delete's local journal) wait on a Notify for that span — Go's per-volume ecjFileAccessLock semantics without the global stall. VolumeMount and the staged-adopt path are also held off while a decode claim is in flight so neither can race the swap. - Rust: the initial journal read ran unlocked, so bytes a rolled-back append later truncated could be folded in as phantom tombstones. The first pass stays unlocked (a slow journal must not stall the store) and a rescan under the quiescing read lock re-reads only committed content; catch_up now rebuilds the id set when a regular journal shrank. - Go: the decode resolved the compaction DiskLocation through FindEcVolume while holding the journal lock, inverting DestroyEcVolume's map->journal order into a deadlock. The lookup now happens first, and DestroyEcVolume/deleteEcVolumeById/DiskLocation.Close destroy outside the map lock. - Go: RebuildEcxFile unlinks .ecj while the volume's ecjFile handle stays open, so later deletes could commit to a detached inode. Both call sites now fold under the journal lock and ReopenDeletionJournal repoints the handle at the live path, working on the volume's resolved .ecx dir (EcIndexBaseFileName) rather than the configured index dir. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: fence EC remounts behind the destroy tombstone DestroyEcVolume, deleteEcVolumeById, and the collection-delete sweep now remove the EcVolume from ecVolumes before destroying it off-lock, so a concurrent remount could re-open shard files that the in-flight destroy then unlinks — registering a detached fd. Each destroy records a per-vid tombstone channel in a new ecVolumesDestroying map before dropping the map entry and closes it when Destroy returns. The tombstone intentionally survives as the vid's destroy generation: loadEcShardWithIdxDir compares it before and after opening the shard, so a destroy that both started and finished inside the open window is still detected. A mismatch drops the just-opened shard (releasing its fd and mount gauge) and retries after the destroy completes; a successful mount clears the stale tombstone. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: rescan the .ecj under the store lock only after a rollback The decode's second journal pass ran a full rescan under the store read lock on every decode, stalling unrelated writers for the length of the scan. Bump a process-wide epoch whenever a failed append truncates its uncommitted tail; an unchanged epoch between the unlocked read and the quiesced pass proves every id folded in was committed, so catch_up() suffices. catch_up() also treats a journal that was read but has since disappeared as shrunk to zero, so its earlier ids cannot linger. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: check the decode tail under the store write lock on delete A blob delete waited for the publishing tail before taking the store write lock, so a decode that claimed the tail while the delete was parked behind the decoder's read lock could still see the journal append land after the rebuilt .idx — an acknowledged delete the mount would miss. Test tail membership under the write lock instead, retrying after the wait; journal_delete_local reports WouldBlock for the same recheck on the distributed path. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: claim the vid for mount and staged adoption, per volume VolumeMount and the staged .copying adoption held the ec_decodes_in_flight set lock through slow file renames and mounts, stalling every unrelated volume's decode, mount, and adoption. Take the per-volume claim instead — the same exclusion against a racing decode for this vid, released when the call returns. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: fail the decode when a compaction commit marker survives CompactVolumeFiles' caller logged a compaction error and went on to delete the EC shards. When the commit marker (.cpc) is still on disk the .dat/.idx swap was decided but could not be reconciled, so the mounted pair may be mismatched — report the failure instead so the shards are kept and the caller can retry. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * volume server: gate the parked-delete test on the held write lock The releaser thread and the spawned delete raced for the store write lock; on a slow runner the delete could acquire it first and commit before the tail was ever claimed, failing !delete.is_finished() on the Windows unit-test job. Spawn the delete only after the thread reports the lock held. --------- Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Chris Lu <chris.lu@gmail.com> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
740 lines
27 KiB
Go
740 lines
27 KiB
Go
package storage
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"slices"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/volume_info"
|
|
)
|
|
|
|
var (
|
|
// Match .ec00 through .ec999 (currently only .ec00-.ec31 are used)
|
|
// Using \d{2,3} for future-proofing if MaxShardCount is ever increased beyond 99
|
|
re = regexp.MustCompile(`\.ec\d{2,3}`)
|
|
)
|
|
|
|
// markEcDestroying records a pending destroy for vid and returns the channel
|
|
// closed when it finishes. Callers must hold ecVolumesLock for writing.
|
|
func (l *DiskLocation) markEcDestroying(vid needle.VolumeId) chan struct{} {
|
|
if l.ecVolumesDestroying == nil {
|
|
l.ecVolumesDestroying = make(map[needle.VolumeId]chan struct{})
|
|
}
|
|
done := make(chan struct{})
|
|
l.ecVolumesDestroying[vid] = done
|
|
return done
|
|
}
|
|
|
|
func (l *DiskLocation) FindEcVolume(vid needle.VolumeId) (*erasure_coding.EcVolume, bool) {
|
|
l.ecVolumesLock.RLock()
|
|
defer l.ecVolumesLock.RUnlock()
|
|
|
|
ecVolume, ok := l.ecVolumes[vid]
|
|
if ok {
|
|
return ecVolume, true
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
func (l *DiskLocation) DestroyEcVolume(vid needle.VolumeId) {
|
|
l.ecVolumesLock.Lock()
|
|
ecVolume, found := l.ecVolumes[vid]
|
|
var done chan struct{}
|
|
if found {
|
|
done = l.markEcDestroying(vid)
|
|
delete(l.ecVolumes, vid)
|
|
}
|
|
l.ecVolumesLock.Unlock()
|
|
|
|
if !found {
|
|
return
|
|
}
|
|
// Destroy outside the write lock: EcVolume.Destroy's Close waits on the
|
|
// deletion-journal lock, which a running ec.decode can hold — under the
|
|
// map lock that wait would stall every EC lookup and invert the
|
|
// map->journal lock order.
|
|
ecVolume.Destroy()
|
|
|
|
// The tombstone stays after close() as this vid's destroy generation: a
|
|
// remount compares it before and after opening files to spot a destroy
|
|
// that ran inside the window. The next successful mount clears it.
|
|
close(done)
|
|
}
|
|
|
|
// UnloadEcVolume drops the in-memory EcVolume for vid from this one disk without
|
|
// deleting files. Exported for the generation-fenced teardown, which unloads only
|
|
// the strictly-older disks rather than node-wide.
|
|
func (l *DiskLocation) UnloadEcVolume(vid needle.VolumeId) {
|
|
l.unloadEcVolume(vid)
|
|
}
|
|
|
|
// unloadEcVolume removes an EC volume from memory without deleting its files on disk.
|
|
// This is useful for distributed EC volumes where shards may be on other servers.
|
|
func (l *DiskLocation) unloadEcVolume(vid needle.VolumeId) {
|
|
var toClose *erasure_coding.EcVolume
|
|
l.ecVolumesLock.Lock()
|
|
if ecVolume, found := l.ecVolumes[vid]; found {
|
|
toClose = ecVolume
|
|
delete(l.ecVolumes, vid)
|
|
}
|
|
l.ecVolumesLock.Unlock()
|
|
|
|
// Close outside the lock to avoid holding write lock during I/O
|
|
if toClose != nil {
|
|
toClose.Close()
|
|
}
|
|
}
|
|
|
|
func (l *DiskLocation) CollectEcShards(vid needle.VolumeId, shardFileNames []string) (ecVolume *erasure_coding.EcVolume, found bool) {
|
|
l.ecVolumesLock.RLock()
|
|
defer l.ecVolumesLock.RUnlock()
|
|
|
|
ecVolume, found = l.ecVolumes[vid]
|
|
if !found {
|
|
return
|
|
}
|
|
for _, ecShard := range ecVolume.Shards {
|
|
if ecShard.ShardId < erasure_coding.ShardId(len(shardFileNames)) {
|
|
shardFileNames[ecShard.ShardId] = erasure_coding.EcShardFileName(ecVolume.Collection, l.Directory, int(ecVolume.VolumeId)) + erasure_coding.ToExt(int(ecShard.ShardId))
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
func (l *DiskLocation) FindEcShard(vid needle.VolumeId, shardId erasure_coding.ShardId) (*erasure_coding.EcVolumeShard, bool) {
|
|
l.ecVolumesLock.RLock()
|
|
defer l.ecVolumesLock.RUnlock()
|
|
|
|
ecVolume, ok := l.ecVolumes[vid]
|
|
if !ok {
|
|
return nil, false
|
|
}
|
|
for _, ecShard := range ecVolume.Shards {
|
|
if ecShard.ShardId == shardId {
|
|
return ecShard, true
|
|
}
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
// HasEcxFileOnDisk reports whether this disk has a sealed .ecx index file
|
|
// for the given (collection, vid). Unlike FindEcVolume this does not
|
|
// require the EC volume to be mounted in memory, which makes it the right
|
|
// primitive for placement decisions during ec.balance / ec.rebuild flows
|
|
// where shards may arrive before any mount has happened on the receiving
|
|
// disk. Without checking the on-disk state, auto-select can split shards
|
|
// from the .ecx that travels with the first shard, which is the source of
|
|
// the orphan-shard layout reported in #9212.
|
|
func (l *DiskLocation) HasEcxFileOnDisk(collection string, vid needle.VolumeId) bool {
|
|
// Prefer the local data directory, where the index sits co-located with the
|
|
// shards during a move or reconstruct, then the shared IdxDirectory.
|
|
// A 0-byte .ecx is a corrupt stub left by a failed EC distribute copy;
|
|
// it cannot drive mount and must not steer placement decisions toward
|
|
// this disk. Treat it as absent so the caller falls through to a
|
|
// sibling disk that may hold a valid index.
|
|
dataBase := erasure_coding.EcShardFileName(collection, l.Directory, int(vid))
|
|
if info, err := os.Stat(dataBase + ".ecx"); err == nil && !info.IsDir() && info.Size() > 0 {
|
|
return true
|
|
}
|
|
if l.IdxDirectory != l.Directory {
|
|
idxBase := erasure_coding.EcShardFileName(collection, l.IdxDirectory, int(vid))
|
|
if info, err := os.Stat(idxBase + ".ecx"); err == nil && !info.IsDir() && info.Size() > 0 {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (l *DiskLocation) LoadEcShard(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId) (*erasure_coding.EcVolume, error) {
|
|
return l.loadEcShardWithIdxDir(collection, vid, shardId, l.IdxDirectory)
|
|
}
|
|
|
|
// loadEcShardWithIdxDir is like LoadEcShard but uses the supplied idxDir as
|
|
// the source of .ecx / .ecj rather than this disk's own IdxDirectory. The
|
|
// orphan-shard reconciliation calls this with a sibling disk's idx folder
|
|
// when shards live on a disk that does not own the index files itself
|
|
// (issue #9212).
|
|
func (l *DiskLocation) loadEcShardWithIdxDir(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, idxDir string) (*erasure_coding.EcVolume, error) {
|
|
|
|
// A destroy-in-progress or already-finished one leaves a tombstone; it
|
|
// stays in the map until a mount clears it, so comparing the channel
|
|
// before and after opening the shard detects any destroy that could have
|
|
// unlinked the files in between — including one that ran to completion
|
|
// inside the window.
|
|
var ecVolumeShard *erasure_coding.EcVolumeShard
|
|
for {
|
|
l.ecVolumesLock.Lock()
|
|
gen := l.ecVolumesDestroying[vid]
|
|
l.ecVolumesLock.Unlock()
|
|
if gen != nil {
|
|
select {
|
|
case <-gen:
|
|
// Destroy already finished; the closed tombstone is the
|
|
// generation token the post-open recheck compares against.
|
|
default:
|
|
// Destroy in flight: its unlinks could detach anything this
|
|
// mount opens, so wait it out and take a fresh generation.
|
|
<-gen
|
|
continue
|
|
}
|
|
}
|
|
|
|
var err error
|
|
ecVolumeShard, err = erasure_coding.NewEcVolumeShard(l.DiskType, l.Directory, collection, vid, shardId)
|
|
if err != nil {
|
|
if err == os.ErrNotExist {
|
|
return nil, os.ErrNotExist
|
|
}
|
|
return nil, fmt.Errorf("failed to create ec shard %d.%d: %w", vid, shardId, err)
|
|
}
|
|
|
|
l.ecVolumesLock.Lock()
|
|
if cur := l.ecVolumesDestroying[vid]; cur != gen {
|
|
// A destroy intervened while the shard was being opened; its
|
|
// unlink may have detached the file. Drop the handle, wait for
|
|
// the destroy, and retry on a clean slate.
|
|
l.ecVolumesLock.Unlock()
|
|
ecVolumeShard.Unmount() // release the gauge the constructor's Mount took
|
|
ecVolumeShard.Close()
|
|
if cur != nil {
|
|
<-cur
|
|
}
|
|
continue
|
|
}
|
|
break
|
|
}
|
|
defer l.ecVolumesLock.Unlock()
|
|
ecVolume, found := l.ecVolumes[vid]
|
|
if !found {
|
|
var err error
|
|
ecVolume, err = erasure_coding.NewEcVolume(l.DiskType, l.Directory, idxDir, collection, vid)
|
|
if err != nil {
|
|
// Wrap with %w so MountEcShards / startup reconcile can use
|
|
// errors.Is(err, os.ErrNotExist) to decide whether to try the
|
|
// next local disk vs. surface the failure.
|
|
return nil, fmt.Errorf("failed to create ec volume %d: %w", vid, err)
|
|
}
|
|
l.ecVolumes[vid] = ecVolume
|
|
// Fresh generation for this vid: the next destroy sets a new
|
|
// tombstone rather than matching the cleared one.
|
|
delete(l.ecVolumesDestroying, vid)
|
|
}
|
|
added, err := ecVolume.AddEcVolumeShard(ecVolumeShard)
|
|
if err != nil {
|
|
// The shard could not be registered (e.g. a 0-byte file beside an
|
|
// index with entries). Leave nothing behind: close the opened shard,
|
|
// and remove the EcVolume if this call just created it and it holds
|
|
// no shards — a zero-shard registration would advertise a mount that
|
|
// serves no data while pinning its descriptors.
|
|
ecVolumeShard.Unmount() // release the gauge the constructor's Mount took
|
|
ecVolumeShard.Close()
|
|
if !found && len(ecVolume.Shards) == 0 {
|
|
delete(l.ecVolumes, vid)
|
|
ecVolume.Close()
|
|
}
|
|
return nil, err
|
|
}
|
|
if !added {
|
|
// Already registered on this disk (a mount retry): the existing
|
|
// shard keeps serving; release the duplicate's fd and gauge so
|
|
// repeated LoadEcShard calls don't leak either.
|
|
ecVolumeShard.Unmount()
|
|
ecVolumeShard.Close()
|
|
}
|
|
|
|
return ecVolume, nil
|
|
}
|
|
|
|
func (l *DiskLocation) UnloadEcShard(vid needle.VolumeId, shardId erasure_coding.ShardId) bool {
|
|
|
|
l.ecVolumesLock.Lock()
|
|
defer l.ecVolumesLock.Unlock()
|
|
|
|
ecVolume, found := l.ecVolumes[vid]
|
|
if !found {
|
|
return false
|
|
}
|
|
if _, deleted := ecVolume.DeleteEcVolumeShard(shardId); deleted {
|
|
if len(ecVolume.Shards) == 0 {
|
|
delete(l.ecVolumes, vid)
|
|
ecVolume.Close()
|
|
}
|
|
return true
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
func (l *DiskLocation) loadEcShards(shards []string, collection string, vid needle.VolumeId, onShardLoad func(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, ecVolume *erasure_coding.EcVolume)) (err error) {
|
|
|
|
for _, shard := range shards {
|
|
shardId, err := strconv.ParseInt(path.Ext(shard)[3:], 10, 64)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse ec shard name %v: %w", shard, err)
|
|
}
|
|
|
|
// Validate shardId range before converting to uint8
|
|
if shardId < 0 || shardId > 255 {
|
|
return fmt.Errorf("shard ID out of range: %d", shardId)
|
|
}
|
|
|
|
ecVolume, err := l.LoadEcShard(collection, vid, erasure_coding.ShardId(shardId))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to load ec shard %v: %w", shard, err)
|
|
}
|
|
if onShardLoad != nil {
|
|
onShardLoad(collection, vid, erasure_coding.ShardId(shardId), ecVolume)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// staleZeroShardAge guards the zero-sized-shard cleanup in loadAllEcShards: a
|
|
// just-created file of an in-flight VolumeEcShardsCopy is legitimately empty
|
|
// for a moment, while failed-operation residue is old by the next scan.
|
|
const staleZeroShardAge = time.Hour
|
|
|
|
func (l *DiskLocation) loadAllEcShards(onShardLoad func(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, ecVolume *erasure_coding.EcVolume)) (err error) {
|
|
|
|
// Keep only the shard and index files this scan acts on: a disk of regular
|
|
// volumes has millions of .dat/.idx/.vif entries that would otherwise each
|
|
// cost a slot in the sorted slice below and a stat() for its size.
|
|
type ecDirEntry struct {
|
|
name string
|
|
size int64
|
|
}
|
|
var dirEntries []ecDirEntry
|
|
collect := func(dir string) error {
|
|
return eachDirEntry(dir, func(entry os.DirEntry) bool {
|
|
if entry.IsDir() {
|
|
return true
|
|
}
|
|
ext := path.Ext(entry.Name())
|
|
if !re.MatchString(ext) && ext != ".ecx" {
|
|
return true
|
|
}
|
|
info, infoErr := entry.Info()
|
|
if infoErr != nil {
|
|
return true
|
|
}
|
|
dirEntries = append(dirEntries, ecDirEntry{name: entry.Name(), size: info.Size()})
|
|
return true
|
|
})
|
|
}
|
|
if err := collect(l.Directory); err != nil {
|
|
return fmt.Errorf("load all ec shards in dir %s: %v", l.Directory, err)
|
|
}
|
|
if l.IdxDirectory != l.Directory {
|
|
if err := collect(l.IdxDirectory); err != nil {
|
|
return fmt.Errorf("load all ec shards in dir %s: %v", l.IdxDirectory, err)
|
|
}
|
|
}
|
|
slices.SortFunc(dirEntries, func(a, b ecDirEntry) int {
|
|
return strings.Compare(a.name, b.name)
|
|
})
|
|
|
|
var sameVolumeShards []string
|
|
var prevVolumeId needle.VolumeId
|
|
var prevCollection string
|
|
|
|
// Helper to reset state between volume processing
|
|
reset := func() {
|
|
sameVolumeShards = nil
|
|
prevVolumeId = 0
|
|
prevCollection = ""
|
|
}
|
|
|
|
for _, fileInfo := range dirEntries {
|
|
name := fileInfo.name
|
|
ext := path.Ext(name)
|
|
baseName := name[:len(name)-len(ext)]
|
|
|
|
collection, volumeId, err := parseCollectionVolumeId(baseName)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
|
|
// A zero-sized shard file is residue of a failed operation (never
|
|
// loaded, but its presence poisons later rebuilds, which select
|
|
// inputs from the directory). Delete it once it is old enough that
|
|
// it cannot be an in-flight copy's just-created file — this scan
|
|
// also runs from LoadNewVolumes while the server is serving. The
|
|
// scan merges the Directory and IdxDirectory listings, so the entry
|
|
// and a candidate path can be different files with one name: each
|
|
// candidate's own age decides, and a same-named fresh file (possibly
|
|
// an in-flight copy's just-created one) always survives.
|
|
if re.MatchString(ext) && fileInfo.size == 0 {
|
|
for _, dir := range []string{l.Directory, l.IdxDirectory} {
|
|
p := path.Join(dir, name)
|
|
fi, statErr := os.Stat(p)
|
|
if statErr != nil || fi.IsDir() || fi.Size() != 0 {
|
|
continue
|
|
}
|
|
if time.Since(fi.ModTime()) <= staleZeroShardAge {
|
|
continue
|
|
}
|
|
if rmErr := os.Remove(p); rmErr != nil {
|
|
glog.Warningf("remove zero-sized ec shard %s: %v", p, rmErr)
|
|
} else {
|
|
glog.Warningf("removed zero-sized ec shard %s (residue of a failed operation)", p)
|
|
}
|
|
}
|
|
continue
|
|
}
|
|
|
|
// 0 byte files should be only appearing erroneously for ec data files
|
|
// so we ignore them
|
|
if re.MatchString(ext) && fileInfo.size > 0 {
|
|
// Group shards by both collection and volumeId to avoid mixing collections
|
|
if prevVolumeId == 0 || (volumeId == prevVolumeId && collection == prevCollection) {
|
|
sameVolumeShards = append(sameVolumeShards, name)
|
|
} else {
|
|
// Before starting a new group, check if previous group had orphaned shards
|
|
l.checkOrphanedShards(sameVolumeShards, prevCollection, prevVolumeId)
|
|
sameVolumeShards = []string{name}
|
|
}
|
|
prevVolumeId = volumeId
|
|
prevCollection = collection
|
|
continue
|
|
}
|
|
|
|
if ext == ".ecx" && volumeId == prevVolumeId && collection == prevCollection {
|
|
l.handleFoundEcxFile(sameVolumeShards, collection, volumeId, onShardLoad)
|
|
reset()
|
|
continue
|
|
}
|
|
|
|
}
|
|
|
|
// Check for orphaned EC shards without .ecx file at the end of the directory scan
|
|
// This handles the last group of shards in the directory
|
|
l.checkOrphanedShards(sameVolumeShards, prevCollection, prevVolumeId)
|
|
|
|
return nil
|
|
}
|
|
|
|
// loadEcShardsWithIdxDir loads each shard file in shards into l.ecVolumes,
|
|
// using idxDir as the source of .ecx / .ecj / .vif (NewEcVolume falls back
|
|
// to dirIdx for .vif when the data dir does not have one). Used by the
|
|
// store-level orphan-shard reconciliation in #9212; stops on the first
|
|
// failure so the caller can log and continue with other volumes.
|
|
func (l *DiskLocation) loadEcShardsWithIdxDir(shards []string, collection string, vid needle.VolumeId, idxDir string, onShardLoad func(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, ecVolume *erasure_coding.EcVolume)) error {
|
|
|
|
for _, shard := range shards {
|
|
ext := path.Ext(shard)
|
|
if len(ext) < 4 {
|
|
return fmt.Errorf("unexpected ec shard name %v", shard)
|
|
}
|
|
shardId, err := strconv.ParseInt(ext[3:], 10, 64)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to parse ec shard name %v: %w", shard, err)
|
|
}
|
|
if shardId < 0 || shardId > 255 {
|
|
return fmt.Errorf("shard ID out of range: %d", shardId)
|
|
}
|
|
|
|
ecVolume, err := l.loadEcShardWithIdxDir(collection, vid, erasure_coding.ShardId(shardId), idxDir)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to load ec shard %v: %w", shard, err)
|
|
}
|
|
if onShardLoad != nil {
|
|
onShardLoad(collection, vid, erasure_coding.ShardId(shardId), ecVolume)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (l *DiskLocation) deleteEcVolumeById(vid needle.VolumeId) (e error) {
|
|
l.ecVolumesLock.Lock()
|
|
ecVolume, ok := l.ecVolumes[vid]
|
|
var done chan struct{}
|
|
if ok {
|
|
done = l.markEcDestroying(vid)
|
|
delete(l.ecVolumes, vid)
|
|
}
|
|
l.ecVolumesLock.Unlock()
|
|
|
|
if !ok {
|
|
return
|
|
}
|
|
// Destroy outside the map lock — see DestroyEcVolume.
|
|
ecVolume.Destroy()
|
|
close(done)
|
|
return
|
|
}
|
|
|
|
func (l *DiskLocation) unmountEcVolumeByCollection(collectionName string) map[needle.VolumeId]*erasure_coding.EcVolume {
|
|
deltaVols := make(map[needle.VolumeId]*erasure_coding.EcVolume, 0)
|
|
for k, v := range l.ecVolumes {
|
|
if v.Collection == collectionName {
|
|
deltaVols[k] = v
|
|
}
|
|
}
|
|
|
|
for k := range deltaVols {
|
|
delete(l.ecVolumes, k)
|
|
// Caller destroys these outside the lock; tombstone until then so a
|
|
// remount can't open files the destroy is about to unlink.
|
|
l.markEcDestroying(k)
|
|
}
|
|
return deltaVols
|
|
}
|
|
|
|
func (l *DiskLocation) EcShardCount() int {
|
|
l.ecVolumesLock.RLock()
|
|
defer l.ecVolumesLock.RUnlock()
|
|
|
|
shardCount := 0
|
|
for _, ecVolume := range l.ecVolumes {
|
|
shardCount += len(ecVolume.Shards)
|
|
}
|
|
return shardCount
|
|
}
|
|
|
|
// handleFoundEcxFile processes a complete group of EC shards when their .ecx file is found.
|
|
// This includes validation, loading, and cleanup of incomplete/invalid EC volumes.
|
|
func (l *DiskLocation) handleFoundEcxFile(shards []string, collection string, volumeId needle.VolumeId, onShardLoad func(collection string, vid needle.VolumeId, shardId erasure_coding.ShardId, ecVolume *erasure_coding.EcVolume)) {
|
|
// Check if this is an incomplete EC encoding (not a distributed EC volume)
|
|
// Key distinction: if .dat file still exists, EC encoding may have failed
|
|
// If .dat file is gone, this is likely a distributed EC volume with shards on multiple servers
|
|
baseFileName := erasure_coding.EcShardFileName(collection, l.Directory, int(volumeId))
|
|
datFileName := baseFileName + ".dat"
|
|
|
|
// Determine .dat presence robustly; unexpected errors are treated as "exists"
|
|
datExists := l.checkDatFileExists(datFileName)
|
|
|
|
// Validate EC volume if .dat file exists (incomplete EC encoding scenario)
|
|
// This checks shard count, shard size consistency, and expected size vs .dat file
|
|
// If .dat is gone, EC encoding completed and shards are distributed across servers
|
|
if datExists && !l.validateEcVolume(collection, volumeId) {
|
|
glog.Warningf("Incomplete or invalid EC volume %d: .dat exists but validation failed, cleaning up EC files...", volumeId)
|
|
l.removeEcVolumeFiles(collection, volumeId)
|
|
return
|
|
}
|
|
|
|
// A load failure (corrupt/locked .ecx, EMFILE, transient I/O) is not proof
|
|
// the shards are disposable -- validateEcVolume already decided they may be
|
|
// the only copy. Release FDs but keep the files for retry; never delete here.
|
|
if err := l.loadEcShards(shards, collection, volumeId, onShardLoad); err != nil {
|
|
glog.Warningf("Failed to load EC shards for volume %d: %v; keeping files for retry", volumeId, err)
|
|
l.unloadEcVolume(volumeId)
|
|
return
|
|
}
|
|
}
|
|
|
|
// checkDatFileExists checks if a .dat file with actual data exists with robust
|
|
// error handling. An empty .dat (<= a superblock, zero needles) is a leftover
|
|
// stub, not an encode source, and is treated as absent so it never justifies
|
|
// deleting shards. Unexpected errors (permission, I/O) are treated as "exists"
|
|
// to avoid misclassifying local EC as distributed EC, which is the safer fallback.
|
|
func (l *DiskLocation) checkDatFileExists(datFileName string) bool {
|
|
if fi, err := os.Stat(datFileName); err == nil {
|
|
return fi.Size() > int64(super_block.SuperBlockSize)
|
|
} else if !os.IsNotExist(err) {
|
|
glog.Warningf("Failed to stat .dat file %s: %v", datFileName, err)
|
|
// Safer to assume local .dat exists to avoid misclassifying as distributed EC
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// checkOrphanedShards checks if the given shards are orphaned (no .ecx file) and cleans them up if needed.
|
|
// Returns true if orphaned shards were found and cleaned up.
|
|
// This handles the case where EC encoding was interrupted before creating the .ecx file.
|
|
func (l *DiskLocation) checkOrphanedShards(shards []string, collection string, volumeId needle.VolumeId) bool {
|
|
if len(shards) == 0 || volumeId == 0 {
|
|
return false
|
|
}
|
|
|
|
// Check if .dat file exists (incomplete encoding, not distributed EC)
|
|
baseFileName := erasure_coding.EcShardFileName(collection, l.Directory, int(volumeId))
|
|
datFileName := baseFileName + ".dat"
|
|
|
|
if l.checkDatFileExists(datFileName) {
|
|
glog.Warningf("Found %d EC shards without .ecx file for volume %d (incomplete encoding interrupted before .ecx creation), cleaning up...",
|
|
len(shards), volumeId)
|
|
l.removeEcVolumeFiles(collection, volumeId)
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
// calculateExpectedShardSize computes the exact expected shard size based on .dat file size
|
|
// The EC encoding process is deterministic:
|
|
// 1. Data is processed in batches of (LargeBlockSize * dataShardCount) for large blocks
|
|
// 2. Remaining data is processed in batches of (SmallBlockSize * dataShardCount) for small blocks
|
|
// 3. Each shard gets exactly its portion, with zero-padding applied to incomplete blocks
|
|
//
|
|
// dataShardCount is taken as a parameter rather than read from
|
|
// erasure_coding.DataShardsCount so that tests writing a custom layout
|
|
// to .vif compute the matching shard size, and so custom-ratio builds
|
|
// (e.g. enterprise) can swap the default without touching this helper.
|
|
// The padded shard length is the same number under both layouts —
|
|
// TestUniformBlockSizeMatchesLegacyShardSize asserts the equivalence for every
|
|
// input — so defer to the encoder's own helper instead of keeping a second copy
|
|
// of the padding rule that a future change would have to be made in twice. An
|
|
// empty .dat keeps its historic answer: the legacy encoder emits no block for
|
|
// it, where UniformBlockSize floors at one.
|
|
func calculateExpectedShardSize(datFileSize int64, dataShardCount int) int64 {
|
|
if dataShardCount <= 0 || datFileSize <= 0 {
|
|
return 0
|
|
}
|
|
return erasure_coding.UniformBlockSize(datFileSize, dataShardCount)
|
|
}
|
|
|
|
// validateEcVolume reports whether the EC files for (collection, vid) on this
|
|
// disk may be deleted to reclaim the local .dat. It returns false (delete)
|
|
// only when that provably loses no data; every ambiguity returns true (keep),
|
|
// since the shards may be the only copy of distributed-EC data.
|
|
func (l *DiskLocation) validateEcVolume(collection string, vid needle.VolumeId) bool {
|
|
baseFileName := erasure_coding.EcShardFileName(collection, l.Directory, int(vid))
|
|
datFileName := baseFileName + ".dat"
|
|
|
|
// Custom ratio comes from the volume's own .vif; the server holds no
|
|
// cluster EC config in memory.
|
|
dataShards := l.ecDataShardsFromVif(collection, vid)
|
|
|
|
// On-disk .dat size, or -1 when absent (an empty <= superblock .dat is a
|
|
// stub). A transient stat error keeps the shards rather than deleting.
|
|
var expectedShardSize int64 = -1
|
|
datExists := false
|
|
if datFileInfo, err := os.Stat(datFileName); err == nil {
|
|
if datFileInfo.Size() > int64(super_block.SuperBlockSize) {
|
|
datExists = true
|
|
expectedShardSize = calculateExpectedShardSize(datFileInfo.Size(), dataShards)
|
|
}
|
|
} else if !os.IsNotExist(err) {
|
|
glog.Warningf("EC volume %d: cannot stat .dat %s (%v); keeping EC shards", vid, datFileName, err)
|
|
return true
|
|
}
|
|
|
|
// Count local shards; a transient stat error or inconsistent sizes -> keep.
|
|
shardCount := 0
|
|
var actualShardSize int64 = -1
|
|
for i := 0; i < erasure_coding.MaxShardCount; i++ {
|
|
shardFileName := baseFileName + erasure_coding.ToExt(i)
|
|
fi, err := os.Stat(shardFileName)
|
|
if err == nil {
|
|
if fi.Size() > 0 {
|
|
if actualShardSize == -1 {
|
|
actualShardSize = fi.Size()
|
|
} else if fi.Size() != actualShardSize {
|
|
glog.Warningf("EC volume %d shard %d size %d != %d; keeping EC shards", vid, i, fi.Size(), actualShardSize)
|
|
return true
|
|
}
|
|
shardCount++
|
|
}
|
|
} else if !os.IsNotExist(err) {
|
|
glog.Warningf("EC volume %d: cannot stat shard %s (%v); keeping EC shards", vid, shardFileName, err)
|
|
return true
|
|
}
|
|
}
|
|
|
|
if !datExists {
|
|
return true // distributed EC; any shard count is valid
|
|
}
|
|
|
|
// Reclaim only when it loses no data. Shards smaller than this .dat's full
|
|
// encode are an interrupted encode whose .dat is the complete source ->
|
|
// reclaim. Shards >= expected (valid/distributing EC, or a stale/partial
|
|
// .dat beside larger real shards) may be the only copy -> keep.
|
|
if shardCount == 0 {
|
|
return false
|
|
}
|
|
if expectedShardSize > 0 && actualShardSize > 0 && actualShardSize < expectedShardSize {
|
|
glog.Warningf("EC volume %d: %d shards of %d bytes are smaller than the .dat's full encode (%d bytes); reclaiming the complete .dat",
|
|
vid, shardCount, actualShardSize, expectedShardSize)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
// ecDataShardsFromVif resolves the data-shard count for an EC volume from
|
|
// its own .vif (EcShardConfig), checking the data dir then the idx dir. The
|
|
// .vif is the source of truth for custom ratios on the volume server, which
|
|
// never holds the cluster EC config in memory. Falls back to the default
|
|
// ratio when the .vif carries no EC shard config.
|
|
func (l *DiskLocation) ecDataShardsFromVif(collection string, vid needle.VolumeId) int {
|
|
// At most two dirs to check; avoid slice/map allocations on this
|
|
// per-volume startup path.
|
|
if l.Directory != "" {
|
|
if ds := ecDataShardsFromVifDir(collection, l.Directory, vid); ds > 0 {
|
|
return ds
|
|
}
|
|
}
|
|
if l.IdxDirectory != "" && l.IdxDirectory != l.Directory {
|
|
if ds := ecDataShardsFromVifDir(collection, l.IdxDirectory, vid); ds > 0 {
|
|
return ds
|
|
}
|
|
}
|
|
return erasure_coding.DataShardsCount
|
|
}
|
|
|
|
// ecDataShardsFromVifDir returns the .vif EcShardConfig data-shard count for
|
|
// (collection, vid) under dir, or 0 when absent / not custom.
|
|
func ecDataShardsFromVifDir(collection, dir string, vid needle.VolumeId) int {
|
|
vifName := erasure_coding.EcShardFileName(collection, dir, int(vid)) + ".vif"
|
|
if vi, _, found, _ := volume_info.MaybeLoadVolumeInfo(vifName); found && vi.EcShardConfig != nil {
|
|
if ds := int(vi.EcShardConfig.DataShards); ds > 0 {
|
|
return ds
|
|
}
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// removeEcVolumeFiles removes all EC-related files for a volume
|
|
func (l *DiskLocation) removeEcVolumeFiles(collection string, vid needle.VolumeId) {
|
|
baseFileName := erasure_coding.EcShardFileName(collection, l.Directory, int(vid))
|
|
indexBaseFileName := erasure_coding.EcShardFileName(collection, l.IdxDirectory, int(vid))
|
|
|
|
// Helper to remove a file with consistent error handling
|
|
removeFile := func(filePath, description string) {
|
|
if err := os.Remove(filePath); err != nil {
|
|
if !os.IsNotExist(err) {
|
|
glog.Warningf("Failed to remove incomplete %s %s: %v", description, filePath, err)
|
|
}
|
|
} else {
|
|
glog.V(2).Infof("Removed incomplete %s: %s", description, filePath)
|
|
}
|
|
}
|
|
|
|
// Remove index files first (.ecx, .ecj) before shard files
|
|
// This ensures that if cleanup is interrupted, the .ecx file won't trigger
|
|
// EC loading for incomplete/missing shards on next startup
|
|
removeFile(indexBaseFileName+".ecx", "EC index file")
|
|
removeFile(indexBaseFileName+".ecj", "EC journal file")
|
|
removeFile(indexBaseFileName+erasure_coding.EcjCompactTmpExt, "EC journal compaction tmp")
|
|
// Also try the data directory in case .ecx/.ecj were created before -dir.idx was configured
|
|
if l.IdxDirectory != l.Directory {
|
|
removeFile(baseFileName+".ecx", "EC index file (fallback)")
|
|
removeFile(baseFileName+".ecj", "EC journal file (fallback)")
|
|
removeFile(baseFileName+erasure_coding.EcjCompactTmpExt, "EC journal compaction tmp (fallback)")
|
|
}
|
|
|
|
// Remove all EC shard files (.ec00 ~ .ec31) from data directory
|
|
// Use MaxShardCount (32) to support custom EC ratios
|
|
for i := 0; i < erasure_coding.MaxShardCount; i++ {
|
|
removeFile(baseFileName+erasure_coding.ToExt(i), "EC shard file")
|
|
}
|
|
|
|
// Staged 2PC generations (<base>.ecNN.v<N>, versioned .ecx/.ecj/.vif)
|
|
// belong to this volume's EC state too; leaving them orphans the files.
|
|
for _, dir := range []string{indexBaseFileName, baseFileName} {
|
|
if err := erasure_coding.RemoveEcGenerationFiles(dir, 0); err != nil {
|
|
glog.Warningf("Failed to remove EC generation files for %s: %v", dir, err)
|
|
}
|
|
}
|
|
}
|