mirror of
https://github.com/milvus-io/milvus.git
synced 2026-10-12 02:19:10 +00:00
issue: #53051, #53052, #53152 ## Summary Align local storage around one path contract: a key is a complete absolute filesystem path, and the local loon/Arrow filesystem is rooted at `/`. Previously, some writers used `minio.rootPath` while others supplied complete local paths to an already-prefixed filesystem, placing files in different physical locations from those expected by readers and GC. Remote keys remain complete bucket-relative object keys; their filesystem-root convention is unchanged. ## Changes - Unify Go/C++ local filesystem roots and StorageV3 manifest-base construction across writers. Preserve the existing base/version pair when continuing a growing-source manifest. - Fix local JSON/TEXT stats reads, rejected-stats cleanup, and explore temporary paths. Exercise resolved V3 stats paths through the actual `LocalChunkManager.MultiRead` interface. - Resolve legacy local manifest bases in loaded metadata and locally referenced snapshots, without eager catalog or manifest-file writes. Preserve manifest CAS compatibility and pathless V3 summaries; copy/restore writes use the target storage root. - Require an absolute, nonempty `localStorage.path` at initialization, including on remote deployments where it is a cache directory. Freeze forbidden parameters against configuration-source refresh while retaining explicit runtime/test overrides, and derive mmap, pprof, and disk-capacity defaults from the same canonical startup value. - Make segment deletion prefixes segment-boundary aware, retain root/identity and snapshot checks, and add BM25 orphan scanning. These shared GC changes also apply to remote storage; this PR does not claim every remote code path is untouched. - Remove the local test-only root override and unused local-only property initialization chain; use the production storage-config initialization path. ## Automatic local upgrade Let `R = localStorage.path` and `M = minio.rootPath`. Before standalone components start, local deployments check the known legacy locations: | Existing data | Upgrade handling | | --- | --- | | Canonical files under `R/<layout>` | Leave in place. | | Double-root files under `R/<R-without-leading-slash>/<layout>` | Move into `R/<layout>` for `insert_log`, `text_log`, `json_stats`, `index_files`, and `index_v1`. | | Recognized late-2.6 unified packed indexes under the process CWD | Move into the corresponding directory under `R`, if visible to the new process. | | Legacy manifest base `M/insert_log/<c>/<p>/<s>`, with files under `R/M/insert_log/<c>/<p>/<s>` | **Do not move the files.** Resolve the loaded manifest base to that existing absolute location. New segment layouts use the canonical root; updates to an existing legacy manifest can retain its base. | Migration prefers directory/subtree rename and recursively merges overlapping directories. Cross-filesystem moves fall back to copy-then-remove. Existing same-name files cause a conflict rather than content comparison or overwrite, except a published copy recognized as this migration's own interrupted work. The copy path synchronizes the file and target directory chain before deleting the source. Remaining sources are rediscovered on retry; empty legacy directories are pruned. Once migrated, restarts probe the known old locations without rescanning canonical data. The initial pass walks legacy file metadata but does not hash file contents. There is no configured migration timeout. SIGTERM/SIGINT cancels the migration and prevents etcd or components from starting; directory walks and cross-filesystem copies observe cancellation between filesystem reads. A canceled partial copy is never published and is recopied from the intact source on the next start. No user migration script, offline command, reverse migration, journal, or backup is provided. Successfully moved sources are removed. ## Compatibility and limits - Preserve the absolute local root, data mounts, and legacy `minio.rootPath` when upgrading. Canonical 2.6 data stays in place; misplaced late-2.6 indexes and affected 3.0.0/3.0.1 layouts are handled as above. Relative roots from older versions are unsupported. - Automatic migration is standalone/local-only. If old CWD indexes disappeared with an old container, they cannot be discovered: preserve/make those files visible or rebuild the derived indexes. Cross-filesystem copy has no configured timeout and can extend the first startup, but a shutdown signal cancels it and the next start resumes from the remaining source. - Downgrade to the affected old layout is unsupported after migration. Symlink layouts require manual resolution. - Known legacy LOB/orphan GC gaps under `R/M/insert_log`, pending old external-refresh paths, and rare interrupted-copy publication residue remain outside scope. This is not a claim that every historical file is recovered or reclaimable. ## Validation At head `898dba4b41`, `ci-v2/build-ut-cov` passed Build, Code Check, Integration UT, Go UT, and C++ UT (9,145/9,145). Diff coverage was 100% for C++ and 81.2% for Go; total patch coverage was 82.8%. Focused local tests for canonical/frozen `localStorage.path` derivation and migration cancellation/deadline/copy recovery passed with `-tags dynamic,test -gcflags='all=-N -l' -count=1`, and `git diff --check` passed before publication. Full paramtable execution remains locally blocked by tests attempting to create `/var/lib/milvus/data`; roles/native-dependent Go tests remain build-blocked by local C++ header/library mismatches. A real 3.0.0/3.0.1 version-to-version upgrade was not executed locally. `ci-v2/e2e-default` and `ci-v2/go-sdk` are still pending for this head. Signed-off-by: xiaofanluan <[email protected]> Co-authored-by: xiaofanluan <[email protected]>
413 lines
12 KiB
Go
413 lines
12 KiB
Go
// Licensed to the LF AI & Data foundation under one
|
|
// or more contributor license agreements. See the NOTICE file
|
|
// distributed with this work for additional information
|
|
// regarding copyright ownership. The ASF licenses this file
|
|
// to you under the Apache License, Version 2.0 (the
|
|
// "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
package localmigrate
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/sha256"
|
|
"fmt"
|
|
"io"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"sort"
|
|
|
|
"github.com/cockroachdb/errors"
|
|
"golang.org/x/sys/unix"
|
|
|
|
"github.com/milvus-io/milvus/pkg/v3/util/merr"
|
|
)
|
|
|
|
// Check actual entries, not overlapping directory prefixes: legacy JSON stats
|
|
// can split even a single segment's _stats directory between the two roots.
|
|
func checkTargets(ctx context.Context, root *os.Root, dirs []migrationDir, report *Report) error {
|
|
planned := make(map[string]bool)
|
|
for _, dir := range dirs {
|
|
err := fs.WalkDir(dir.source.root.FS(), dir.path, func(name string, entry fs.DirEntry, err error) error {
|
|
if ctxErr := ctx.Err(); ctxErr != nil {
|
|
return ctxErr
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !entry.IsDir() && !entry.Type().IsRegular() {
|
|
return merr.WrapErrDataIntegrityMsg("legacy source %s is not a regular file", name)
|
|
}
|
|
rel, err := filepath.Rel(dir.path, name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
target := filepath.Join(dir.target, rel)
|
|
isDir, seen := planned[target]
|
|
conflict := seen && (!isDir || !entry.IsDir())
|
|
planned[target] = entry.IsDir()
|
|
info, err := root.Lstat(target)
|
|
switch {
|
|
case err == nil:
|
|
if !entry.IsDir() || !info.IsDir() {
|
|
published, err := publishedCopy(dir.source.root, name, root, target)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
conflict = conflict || !published
|
|
}
|
|
case errors.Is(err, unix.ENOTDIR):
|
|
conflict = true
|
|
case !os.IsNotExist(err):
|
|
return err
|
|
}
|
|
if conflict {
|
|
report.Conflicts = append(report.Conflicts, filepath.Join(root.Name(), target))
|
|
if entry.IsDir() {
|
|
return fs.SkipDir
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func moveEntry(ctx context.Context, source *os.Root, name string, root *os.Root, target string, report *Report) error {
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
if err := rejectSymlinks(source, name); err != nil {
|
|
return err
|
|
}
|
|
if err := rejectSymlinks(root, target); err != nil {
|
|
return err
|
|
}
|
|
info, err := source.Lstat(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
dest, err := root.Lstat(target)
|
|
if os.IsNotExist(err) {
|
|
if err := root.MkdirAll(filepath.Dir(target), 0o755); err != nil {
|
|
return err
|
|
}
|
|
if err := renameEntry(source, name, root, target); err == nil {
|
|
report.Renamed++
|
|
return nil
|
|
} else if !errors.Is(err, unix.EXDEV) {
|
|
return merr.Wrapf(err, "rename local layout %s to %s", name, target)
|
|
}
|
|
if !info.IsDir() {
|
|
return copyFile(ctx, source, name, root, target, report)
|
|
}
|
|
if err := root.Mkdir(target, info.Mode().Perm()); err != nil {
|
|
return err
|
|
}
|
|
} else if err != nil {
|
|
return err
|
|
} else if !info.IsDir() || !dest.IsDir() {
|
|
published, err := publishedCopy(source, name, root, target)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if published {
|
|
return finishCopy(source, name, root, target, report)
|
|
}
|
|
return merr.WrapErrDataIntegrityMsg("local layout file already exists: %s", filepath.Join(root.Name(), target))
|
|
}
|
|
entries, err := fs.ReadDir(source.FS(), name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Keep a CWD leaf recognizable after an interruption while moving auxiliary
|
|
// files: its packed index files are the last entries removed from the source.
|
|
sort.SliceStable(entries, func(i, j int) bool {
|
|
return !isLegacyUnifiedIndexFile(entries[i].Name()) && isLegacyUnifiedIndexFile(entries[j].Name())
|
|
})
|
|
for _, entry := range entries {
|
|
if err := moveEntry(ctx, source, filepath.Join(name, entry.Name()), root, filepath.Join(target, entry.Name()), report); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return source.Remove(name) // Only the now-empty source directory is removed.
|
|
}
|
|
|
|
// removeEmptyLegacyDirectories prunes children before parents using the existing
|
|
// discovery order. Rmdir leaves nonempty directories and replacement files alone;
|
|
// it never removes the working directory itself or recursively deletes content.
|
|
func removeEmptyLegacyDirectories(ctx context.Context, source *migrationSource) error {
|
|
for i := len(source.cleanupDirs) - 1; i >= 0; i-- {
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
name := source.cleanupDirs[i]
|
|
if err := rejectSymlinks(source.root, name); err != nil {
|
|
if errors.Is(err, unix.ENOTDIR) {
|
|
continue
|
|
}
|
|
return err
|
|
}
|
|
parent, err := source.root.Open(filepath.Dir(name))
|
|
if os.IsNotExist(err) || errors.Is(err, unix.ENOTDIR) {
|
|
continue
|
|
}
|
|
if err != nil {
|
|
return merr.Wrapf(err, "open legacy parent for cleanup %s", name)
|
|
}
|
|
err = unix.Unlinkat(int(parent.Fd()), filepath.Base(name), unix.AT_REMOVEDIR)
|
|
closeErr := parent.Close()
|
|
if err != nil && !os.IsNotExist(err) && !errors.Is(err, unix.ENOTEMPTY) &&
|
|
!errors.Is(err, unix.EEXIST) && !errors.Is(err, unix.ENOTDIR) {
|
|
return merr.Wrapf(err, "remove empty legacy directory %s", name)
|
|
}
|
|
if closeErr != nil {
|
|
return merr.Wrapf(closeErr, "close legacy parent for cleanup %s", name)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func renameEntry(source *os.Root, name string, root *os.Root, target string) error {
|
|
from, err := source.Open(filepath.Dir(name))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer from.Close()
|
|
to, err := root.Open(filepath.Dir(target))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer to.Close()
|
|
return unix.Renameat(int(from.Fd()), filepath.Base(name), int(to.Fd()), filepath.Base(target))
|
|
}
|
|
|
|
// The hash identifies one source-to-target publication, not its contents.
|
|
// The data temporary file is renamed into place; a small sidecar marker remains
|
|
// until the source removal is durable so a restart can recognize that target as
|
|
// this migration's own completed copy.
|
|
func copyArtifactBase(source *os.Root, name, target string) string {
|
|
sum := sha256.Sum256([]byte(source.Name() + "\x00" + name + "\x00" + target))
|
|
return filepath.Join(filepath.Dir(target), fmt.Sprintf(".milvus-local-copy-%x", sum))
|
|
}
|
|
|
|
func copyTempPath(source *os.Root, name, target string) string {
|
|
return copyArtifactBase(source, name, target) + ".tmp"
|
|
}
|
|
|
|
func copyMarkerPath(source *os.Root, name, target string) string {
|
|
return copyArtifactBase(source, name, target) + ".published"
|
|
}
|
|
|
|
func copyMarkerPayload(source *os.Root, name, target string, size int64) []byte {
|
|
return []byte(fmt.Sprintf("milvus-local-copy-v1\n%s\n%d\n", copyArtifactBase(source, name, target), size))
|
|
}
|
|
|
|
func publishedCopy(source *os.Root, name string, root *os.Root, target string) (bool, error) {
|
|
markerPath := copyMarkerPath(source, name, target)
|
|
marker, err := root.Lstat(markerPath)
|
|
if os.IsNotExist(err) {
|
|
return false, nil
|
|
}
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if !marker.Mode().IsRegular() {
|
|
return false, merr.WrapErrDataIntegrityMsg("invalid local migration publication marker for %s", target)
|
|
}
|
|
sourceInfo, err := source.Lstat(name)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
expectedMarker := copyMarkerPayload(source, name, target, sourceInfo.Size())
|
|
actualMarker, err := root.ReadFile(markerPath)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if !bytes.Equal(actualMarker, expectedMarker) {
|
|
return false, merr.WrapErrDataIntegrityMsg("invalid local migration publication marker for %s", target)
|
|
}
|
|
dest, err := root.Lstat(target)
|
|
if os.IsNotExist(err) {
|
|
return false, nil
|
|
}
|
|
return err == nil && dest.Mode().IsRegular() && dest.Size() == sourceInfo.Size(), err
|
|
}
|
|
|
|
func copyFile(ctx context.Context, source *os.Root, name string, root *os.Root, target string, report *Report) error {
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
in, err := source.Open(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer in.Close()
|
|
info, err := in.Stat()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !info.Mode().IsRegular() {
|
|
return merr.WrapErrDataIntegrityMsg("legacy source %s is not a regular file", name)
|
|
}
|
|
temp := copyTempPath(source, name, target)
|
|
marker := copyMarkerPath(source, name, target)
|
|
for _, artifact := range []string{temp, marker} {
|
|
if err := rejectSymlinks(root, artifact); err != nil {
|
|
return err
|
|
}
|
|
if previous, err := root.Lstat(artifact); err == nil {
|
|
if !previous.Mode().IsRegular() {
|
|
return merr.WrapErrDataIntegrityMsg("invalid local migration copy artifact for %s", target)
|
|
}
|
|
} else if !os.IsNotExist(err) {
|
|
return err
|
|
}
|
|
// A previous interrupted copy was never published. Recopy from the
|
|
// intact source; never expose a partially written file under the final
|
|
// name.
|
|
if err := root.Remove(artifact); err != nil && !os.IsNotExist(err) {
|
|
return err
|
|
}
|
|
}
|
|
out, err := root.OpenFile(temp, os.O_CREATE|os.O_EXCL|os.O_WRONLY, info.Mode().Perm())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
published := false
|
|
defer func() {
|
|
out.Close()
|
|
if !published {
|
|
_ = root.Remove(temp)
|
|
_ = root.Remove(marker)
|
|
}
|
|
}()
|
|
if _, err := io.Copy(out, &contextReader{ctx: ctx, reader: in}); err != nil {
|
|
return merr.Wrapf(err, "copy local layout %s to %s", name, target)
|
|
}
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
if err := out.Sync(); err != nil {
|
|
return err
|
|
}
|
|
if err := out.Close(); err != nil {
|
|
return err
|
|
}
|
|
markerFile, err := root.OpenFile(marker, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
markerOpen := true
|
|
defer func() {
|
|
if markerOpen {
|
|
markerFile.Close()
|
|
}
|
|
}()
|
|
if _, err := markerFile.Write(copyMarkerPayload(source, name, target, info.Size())); err != nil {
|
|
return err
|
|
}
|
|
if err := markerFile.Sync(); err != nil {
|
|
return err
|
|
}
|
|
if err := markerFile.Close(); err != nil {
|
|
return err
|
|
}
|
|
markerOpen = false
|
|
// Persist the proof and complete temporary file before publishing it. If
|
|
// the process stops after the rename, the next startup can finish source
|
|
// removal instead of treating its own target as an unrelated conflict.
|
|
if err := syncDirectory(root, filepath.Dir(target)); err != nil {
|
|
return err
|
|
}
|
|
if err := renameEntry(root, temp, root, target); err != nil {
|
|
return err
|
|
}
|
|
published = true
|
|
if err := ctx.Err(); err != nil {
|
|
return err
|
|
}
|
|
return finishCopy(source, name, root, target, report)
|
|
}
|
|
|
|
type contextReader struct {
|
|
ctx context.Context
|
|
reader io.Reader
|
|
}
|
|
|
|
func (r *contextReader) Read(buffer []byte) (int, error) {
|
|
if err := r.ctx.Err(); err != nil {
|
|
return 0, err
|
|
}
|
|
return r.reader.Read(buffer)
|
|
}
|
|
|
|
func syncDirectory(root *os.Root, directory string) error {
|
|
opened, err := root.Open(directory)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = opened.Sync()
|
|
closeErr := opened.Close()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return closeErr
|
|
}
|
|
|
|
// Persist the target entry and every ancestor link that MkdirAll may have
|
|
// created. Syncing only the leaf directory does not make new parents durable.
|
|
// Repeat this on recovery too: an existing directory may be from an interrupted
|
|
// migration that never finished syncing its parents.
|
|
func syncCopyTargetDirectories(root *os.Root, directory string) error {
|
|
for {
|
|
parent, err := root.Open(directory)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = parent.Sync()
|
|
closeErr := parent.Close()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if closeErr != nil {
|
|
return closeErr
|
|
}
|
|
if directory == "." {
|
|
return nil
|
|
}
|
|
directory = filepath.Dir(directory)
|
|
}
|
|
}
|
|
|
|
func finishCopy(source *os.Root, name string, root *os.Root, target string, report *Report) error {
|
|
if err := syncCopyTargetDirectories(root, filepath.Dir(target)); err != nil {
|
|
return err
|
|
}
|
|
sourceParent, err := source.Open(filepath.Dir(name))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer sourceParent.Close()
|
|
if err := source.Remove(name); err != nil {
|
|
return err
|
|
}
|
|
// Persist source removal before dropping the publication marker. Otherwise
|
|
// a power loss could resurrect the source without proof that target is ours.
|
|
if err := sourceParent.Sync(); err != nil {
|
|
return err
|
|
}
|
|
// Best-effort: the copy is already published and the source is gone, so the
|
|
// migration is complete. The sidecar is only retry provenance, not data.
|
|
_ = root.Remove(copyMarkerPath(source, name, target))
|
|
report.Copied++
|
|
return nil
|
|
}
|