mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-20 08:41:29 +00:00
* refactor(command): expand "~" in all path-style CLI flags Many of weed's path-bearing flags (-s3.config, -s3.iam.config, -admin.dataDir, -webdav.cacheDir, -volume.dir.idx, TLS cert/key files, profile output paths, mount cache dirs, sftp key files, ...) were never run through util.ResolvePath, so a value like "~/iam.json" was used literally. Tilde only worked when the shell expanded it, which silently fails for the common -flag=~/path form (bash leaves the tilde literal in --opt=~/path). - Extend util.ResolvePath to also handle "~user" / "~user/rest", matching shell tilde expansion. Add unit tests. - Apply util.ResolvePath at the top of each shared start* function (s3, webdav, sftp) so mini/server/filer/standalone callers all inherit it; resolve at the few one-off use sites (mount cache dirs, volume idx folder, mini admin.dataDir, profile paths). - Drop the duplicate expandHomeDir helper from admin.go in favor of the now-equivalent util.ResolvePath. * fixup: handle comma-separated -dir flags for tilde expansion `weed mini -dir`, `weed server -dir`, and `weed volume -dir` accept comma-separated paths (`dir[,dir]...`). Calling util.ResolvePath on the whole string mishandled multi-folder values with tilde, e.g. "~/d1,~/d2" would resolve as if "d1,~/d2" were a single subpath. - Add util.ResolveCommaSeparatedPaths: split on ",", run each entry through ResolvePath, rejoin. Short-circuits when no "~" present. - Use it for *miniDataFolders (mini.go), *volumeDataFolders (server.go), and resolve each entry of v.folders in-place (volume.go) so all downstream consumers see resolved paths. - Add 7-case TestResolveCommaSeparatedPaths covering empty, single, multiple, and mixed inputs. * address PR review: metaFolder + Windows backslash - master.go: resolve *m.metaFolder at the top of runMaster so util.FullPath(*m.metaFolder) on the next line sees an expanded path. Drop the now-redundant ResolvePath in TestFolderWritable. - server.go: same treatment for *masterOptions.metaFolder, paired with the existing cpu/mem profile resolves. Drop the redundant inner ResolvePath at TestFolderWritable. - file_util.go: ResolvePath now accepts filepath.Separator as a separator after the tilde, so "~\\data" works on Windows. Other platforms keep current behaviour (backslash stays literal because it is a valid filename character in usernames and paths). - file_util_test.go: add two cases using filepath.Separator that exercise the new code path on Windows and remain a no-op on Unix. * address PR review: resolve "~" in remaining command path flags Comprehensive sweep of path-bearing flags across every weed subcommand, applying util.ResolvePath in-place at the top of each run* function so all downstream consumers see expanded paths. - webdav.go: resolve *wo.cacheDir at the top of startWebDav so mini/server/filer/standalone callers all inherit it. - mount_std.go: cpu/mem profile paths. - filer_sync.go: cpu/mem profile paths. - mq_broker.go: cpu/mem profile paths. - benchmark.go: cpuprofile output path. - backup.go: -dir resolved once at runBackup; drop the duplicated inline ResolvePath in NewVolume calls. - compact.go: -dir resolved at runCompact; drop inline ResolvePath. - export.go: -dir and -o resolved at runExport; drop inline ResolvePath in LoadFromIdx and ScanVolumeFile. - download.go: -dir resolved at runDownload; drop inline. - update.go: -dir resolved at runUpdate so filepath.Join uses the expanded path; drop inline ResolvePath in TestFolderWritable. - scaffold.go: -output expanded before filepath.Join. - worker.go: -workingDir expanded before being passed to runtime. * address PR review: resolve option-struct paths at run* entry points server.go:381 propagates s3Options.config to filerOptions.s3ConfigFile *before* startS3Server runs, which meant the filer-side code saw the unresolved tilde-prefixed pointer. Same pattern for webdavOptions and sftpOptions (and equivalent in mini.go / filer.go). The fix: hoist resolution from the shared start* functions up to the run* entry points, where every shared pointer is set up before any propagation happens. - s3.go, webdav.go, sftp.go: extract a resolvePaths() method on each Options struct that runs every path field through util.ResolvePath in-place. Idempotent. - runS3, runWebDav, runSftp: call the standalone struct's resolvePaths before starting metrics / loading security config. - runServer, runMini, runFiler: call resolvePaths on every embedded options struct, plus resolve loose flags (serverIamConfig, miniS3Config, miniIamConfig, miniMasterOptions.metaFolder, and filer's defaultLevelDbDirectory) so they're expanded before any pointer copy or use. - Drop the now-redundant inline ResolvePath at filer's defaultLevelDbDirectory composition. * address PR review: re-resolve mini -dir post-config, cover misc paths - mini.go: applyConfigFileOptions can overwrite -dir with a literal ~/data from mini.options. Re-resolve *miniDataFolders after the config-file apply, alongside the other path resolves, so the mini filer no longer ends up with a literal ~/data/filerldb2. - benchmark.go: resolve *b.idListFile (-list). - filer_sync.go: resolve *syncOptions.aSecurity / .bSecurity (-a.security / -b.security) before LoadClientTLSFromFile. - filer_cat.go: resolve *filerCat.output (-o) before os.OpenFile. - admin.go: drop trailing blank line at EOF (git diff --check). * address PR review: resolve -a.security/-b.security/-config before use Three follow-up fixes: - filer_sync.go: the -a.security / -b.security resolves were placed *after* LoadClientTLSFromFile / LoadHTTPClientFromFile were called, so weed filer.sync -a.security=~/a.toml still passed the literal tilde path. Hoist the resolves above the security-loading block so TLS clients see expanded paths. - filer_sync_verify.go: same flag pair was never resolved at all in the verify command; resolve at the top of runFilerSyncVerify. - filer_meta_backup.go: -config (the backup_filer.toml path) was passed directly to viper. Resolve at the top of runFilerMetaBackup. - mini.go: master.dir defaulted to the entire comma-joined miniDataFolders. With weed mini -dir=~/d1,~/d2 (or any multi-dir setup), TestFolderWritable then stat'd the joined string instead of a single directory. Default to the first entry via StringSplit to mirror the disk-space calculation a few lines below, and drop the now-redundant ResolvePath in TestFolderWritable.
236 lines
7.6 KiB
Go
236 lines
7.6 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/security"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/operation"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage"
|
|
)
|
|
|
|
var (
|
|
s BackupOptions
|
|
)
|
|
|
|
type BackupOptions struct {
|
|
master *string
|
|
server *string // deprecated, for backward compatibility
|
|
collection *string
|
|
dir *string
|
|
volumeId *int
|
|
ttl *string
|
|
replication *string
|
|
}
|
|
|
|
func init() {
|
|
cmdBackup.Run = runBackup // break init cycle
|
|
s.master = cmdBackup.Flag.String("master", "localhost:9333", "SeaweedFS master location")
|
|
s.server = cmdBackup.Flag.String("server", "", "SeaweedFS master location (deprecated, use -master instead)")
|
|
s.collection = cmdBackup.Flag.String("collection", "", "collection name")
|
|
s.dir = cmdBackup.Flag.String("dir", ".", "directory to store volume data files")
|
|
s.volumeId = cmdBackup.Flag.Int("volumeId", -1, "a volume id. The volume .dat and .idx files should already exist in the dir.")
|
|
s.ttl = cmdBackup.Flag.String("ttl", "", `backup volume's time to live, format:
|
|
3m: 3 minutes
|
|
4h: 4 hours
|
|
5d: 5 days
|
|
6w: 6 weeks
|
|
7M: 7 months
|
|
8y: 8 years
|
|
default is the same with origin`)
|
|
s.replication = cmdBackup.Flag.String("replication", "", "backup volume's replication, default is the same with origin")
|
|
}
|
|
|
|
var cmdBackup = &Command{
|
|
UsageLine: "backup -dir=. -volumeId=234 -master=localhost:9333",
|
|
Short: "incrementally backup a volume to local folder",
|
|
Long: `Incrementally backup volume data.
|
|
|
|
It is expected that you use this inside a script, to loop through
|
|
all possible volume ids that needs to be backup to local folder.
|
|
|
|
The volume id does not need to exist locally or even remotely.
|
|
This will help to backup future new volumes.
|
|
|
|
Usually backing up is just copying the .dat (and .idx) files.
|
|
But it's tricky to incrementally copy the differences.
|
|
|
|
The complexity comes when there are multiple addition, deletion and compaction.
|
|
This tool will handle them correctly and efficiently, avoiding unnecessary data transportation.
|
|
`,
|
|
}
|
|
|
|
// parseTTL parses the TTL from user input or volume stats.
|
|
// Returns (ttl, error, isFatal) where isFatal=true for invalid user input.
|
|
func parseTTL(userTTL string, statsTTL string) (*needle.TTL, error, bool) {
|
|
if userTTL != "" {
|
|
ttl, err := needle.ReadTTL(userTTL)
|
|
if err != nil {
|
|
// User-provided TTL is invalid - this is fatal
|
|
return nil, fmt.Errorf("invalid user-provided ttl %s: %w", userTTL, err), true
|
|
}
|
|
return ttl, nil, false
|
|
}
|
|
|
|
ttl, err := needle.ReadTTL(statsTTL)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parsing ttl %s from stats: %w", statsTTL, err), false
|
|
}
|
|
return ttl, nil, false
|
|
}
|
|
|
|
// parseReplication parses the replication from user input or volume stats.
|
|
// Returns (replication, error, isFatal) where isFatal=true for invalid user input.
|
|
func parseReplication(userReplication string, statsReplication string) (*super_block.ReplicaPlacement, error, bool) {
|
|
if userReplication != "" {
|
|
replication, err := super_block.NewReplicaPlacementFromString(userReplication)
|
|
if err != nil {
|
|
// User-provided replication is invalid - this is fatal
|
|
return nil, fmt.Errorf("invalid user-provided replication %s: %w", userReplication, err), true
|
|
}
|
|
return replication, nil, false
|
|
}
|
|
|
|
replication, err := super_block.NewReplicaPlacementFromString(statsReplication)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parsing replication %s from stats: %w", statsReplication, err), false
|
|
}
|
|
return replication, nil, false
|
|
}
|
|
|
|
// backupFromLocation attempts to backup a volume from a specific volume server location.
|
|
// Returns (error, isFatal) where isFatal=true means the error is due to invalid user input
|
|
// and should not be retried with other locations.
|
|
func backupFromLocation(volumeServer pb.ServerAddress, grpcDialOption grpc.DialOption, vid needle.VolumeId) (error, bool) {
|
|
stats, err := operation.GetVolumeSyncStatus(volumeServer, grpcDialOption, uint32(vid))
|
|
if err != nil {
|
|
return fmt.Errorf("getting volume status: %w", err), false
|
|
}
|
|
|
|
// Parse TTL
|
|
ttl, err, isFatal := parseTTL(*s.ttl, stats.Ttl)
|
|
if err != nil {
|
|
return err, isFatal
|
|
}
|
|
|
|
// Parse replication
|
|
replication, err, isFatal := parseReplication(*s.replication, stats.Replication)
|
|
if err != nil {
|
|
return err, isFatal
|
|
}
|
|
|
|
ver := needle.Version(stats.Version)
|
|
|
|
// Create or load the volume
|
|
v, err := storage.NewVolume(*s.dir, *s.dir, *s.collection, vid, storage.NeedleMapInMemory, replication, ttl, 0, ver, 0, 0)
|
|
if err != nil {
|
|
return fmt.Errorf("creating or reading volume: %w", err), false
|
|
}
|
|
|
|
// Handle compaction if needed
|
|
if v.SuperBlock.CompactionRevision < uint16(stats.CompactRevision) {
|
|
if err = v.CompactByIndex(nil); err != nil {
|
|
v.Close()
|
|
return fmt.Errorf("compacting volume: %w", err), false
|
|
}
|
|
if err = v.CommitCompact(); err != nil {
|
|
v.Close()
|
|
return fmt.Errorf("committing compaction: %w", err), false
|
|
}
|
|
v.SuperBlock.CompactionRevision = uint16(stats.CompactRevision)
|
|
if _, err = v.DataBackend.WriteAt(v.SuperBlock.Bytes(), 0); err != nil {
|
|
v.Close()
|
|
return fmt.Errorf("writing superblock: %w", err), false
|
|
}
|
|
}
|
|
|
|
datSize, _, _ := v.FileStat()
|
|
|
|
// If local volume is larger than remote, recreate it
|
|
if datSize > stats.TailOffset {
|
|
if err := v.Destroy(false); err != nil {
|
|
v.Close()
|
|
return fmt.Errorf("destroying volume: %w", err), false
|
|
}
|
|
v.Close() // Close the destroyed volume
|
|
// recreate an empty volume
|
|
v, err = storage.NewVolume(*s.dir, *s.dir, *s.collection, vid, storage.NeedleMapInMemory, replication, ttl, 0, ver, 0, 0)
|
|
if err != nil {
|
|
return fmt.Errorf("recreating volume: %w", err), false
|
|
}
|
|
}
|
|
|
|
// Perform the incremental backup
|
|
if err := v.IncrementalBackup(volumeServer, grpcDialOption); err != nil {
|
|
v.Close()
|
|
return fmt.Errorf("incremental backup: %w", err), false
|
|
}
|
|
|
|
v.Close()
|
|
return nil, false
|
|
}
|
|
|
|
func runBackup(cmd *Command, args []string) bool {
|
|
|
|
*s.dir = util.ResolvePath(*s.dir)
|
|
util.LoadSecurityConfiguration()
|
|
grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.client")
|
|
|
|
// Backward compatibility: if -server is provided, use it
|
|
masterServer := *s.master
|
|
if *s.server != "" {
|
|
masterServer = *s.server
|
|
}
|
|
|
|
if *s.volumeId == -1 {
|
|
return false
|
|
}
|
|
vid := needle.VolumeId(*s.volumeId)
|
|
|
|
// find volume location, replication, ttl info
|
|
lookup, err := operation.LookupVolumeId(func(_ context.Context) pb.ServerAddress { return pb.ServerAddress(masterServer) }, grpcDialOption, vid.String())
|
|
if err != nil {
|
|
fmt.Printf("Error looking up volume %d: %v\n", vid, err)
|
|
return true
|
|
}
|
|
if len(lookup.Locations) == 0 {
|
|
fmt.Printf("Error: volume %d has no locations available\n", vid)
|
|
return true
|
|
}
|
|
|
|
// Try each available location until one succeeds
|
|
var lastErr error
|
|
for i, location := range lookup.Locations {
|
|
volumeServer := location.ServerAddress()
|
|
fmt.Printf("Attempting to backup volume %d from location %d/%d: %s\n", vid, i+1, len(lookup.Locations), volumeServer)
|
|
|
|
err, isFatal := backupFromLocation(volumeServer, grpcDialOption, vid)
|
|
if err != nil {
|
|
fmt.Printf("Error backing up volume %d from %s: %v\n", vid, volumeServer, err)
|
|
lastErr = err
|
|
// Check if this is a fatal user-input error
|
|
if isFatal {
|
|
return true
|
|
}
|
|
continue
|
|
}
|
|
|
|
// Success!
|
|
fmt.Printf("Successfully backed up volume %d from %s\n", vid, volumeServer)
|
|
return true
|
|
}
|
|
|
|
// All locations failed
|
|
fmt.Printf("Failed to backup volume %d after trying all %d locations. Last error: %v\n", vid, len(lookup.Locations), lastErr)
|
|
|
|
return true
|
|
}
|