* opt: reduce ShardsInfo memory usage with bitmap and sorted slice - Replace map[ShardId]*ShardInfo with sorted []ShardInfo slice - Add ShardBits (uint32) bitmap for O(1) existence checks - Use binary search for O(log n) lookups by shard ID - Maintain sorted order for efficient iteration - Add comprehensive unit tests and benchmarks Memory savings: - Map overhead: ~48 bytes per entry eliminated - Pointers: 8 bytes per entry eliminated - Total: ~56 bytes per shard saved Performance improvements: - Has(): O(1) using bitmap - Size(): O(log n) using binary search (was O(1), acceptable tradeoff) - Count(): O(1) using popcount on bitmap - Iteration: Faster due to cache locality * refactor: add methods to ShardBits type - Add Has(), Set(), Clear(), and Count() methods to ShardBits - Simplify ShardsInfo methods by using ShardBits methods - Improves code readability and encapsulation * opt: use ShardBits directly in ShardsCountFromVolumeEcShardInformationMessage Avoid creating a full ShardsInfo object just to count shards. Directly cast vi.EcIndexBits to ShardBits and use Count() method. * opt: use strings.Builder in ShardsInfo.String() for efficiency * refactor: change AsSlice to return []ShardInfo (values instead of pointers) This completes the memory optimization by avoiding unnecessary pointer slices and potential allocations. * refactor: rename ShardsCountFromVolumeEcShardInformationMessage to GetShardCount * fix: prevent deadlock in Add and Subtract methods Copy shards data from 'other' before releasing its lock to avoid potential deadlock when a.Add(b) and b.Add(a) are called concurrently. The previous implementation held other's lock while calling si.Set/Delete, which acquires si's lock. This could deadlock if two goroutines tried to add/subtract each other concurrently. * opt: avoid unnecessary locking in constructor functions ShardsInfoFromVolume and ShardsInfoFromVolumeEcShardInformationMessage now build shards slice and bitmap directly without calling Set(), which acquires a lock on every call. Since the object is local and not yet shared, locking is unnecessary and adds overhead. This improves performance during object construction. * fix: rename 'copy' variable to avoid shadowing built-in function The variable name 'copy' in TestShardsInfo_Copy shadowed the built-in copy() function, which is confusing and bad practice. Renamed to 'siCopy'. * opt: use math/bits.OnesCount32 and reorganize types 1. Replace manual popcount loop with math/bits.OnesCount32 for better performance and idiomatic Go code 2. Move ShardSize type definition to ec_shards_info.go for better code organization since it's primarily used there * refactor: Set() now accepts ShardInfo for future extensibility Changed Set(id ShardId, size ShardSize) to Set(shard ShardInfo) to support future additions to ShardInfo without changing the API. This makes the code more extensible as new fields can be added to ShardInfo (e.g., checksum, location, etc.) without breaking the Set API. * refactor: move ShardInfo and ShardSize to separate file Created ec_shard_info.go to hold the basic shard types (ShardInfo and ShardSize) for better code organization and separation of concerns. * refactor: add ShardInfo constructor and helper functions Added NewShardInfo() constructor and IsValid() method to better encapsulate ShardInfo creation and validation. Updated code to use the constructor for cleaner, more maintainable code. * fix: update remaining Set() calls to use NewShardInfo constructor Fixed compilation errors in storage and shell packages where Set() calls were not updated to use the new NewShardInfo() constructor. * fix: remove unreachable code in filer backup commands Removed unreachable return statements after infinite loops in filer_backup.go and filer_meta_backup.go to fix compilation errors. * fix: rename 'new' variable to avoid shadowing built-in Renamed 'new' to 'result' in MinusParityShards, Plus, and Minus methods to avoid shadowing Go's built-in new() function. * fix: update remaining test files to use NewShardInfo constructor Fixed Set() calls in command_volume_list_test.go and ec_rebalance_slots_test.go to use NewShardInfo() constructor.
319 lines
10 KiB
Go
319 lines
10 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"reflect"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/spf13/viper"
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/security"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
var (
|
|
metaBackup FilerMetaBackupOptions
|
|
)
|
|
|
|
type FilerMetaBackupOptions struct {
|
|
grpcDialOption grpc.DialOption
|
|
filerAddress *string
|
|
filerDirectory *string
|
|
includePrefixes *string
|
|
excludePrefixes *string
|
|
restart *bool
|
|
backupFilerConfig *string
|
|
|
|
pathFilter *util.PathPrefixFilter
|
|
store filer.FilerStore
|
|
clientId int32
|
|
clientEpoch int32
|
|
}
|
|
|
|
func init() {
|
|
cmdFilerMetaBackup.Run = runFilerMetaBackup // break init cycle
|
|
metaBackup.filerAddress = cmdFilerMetaBackup.Flag.String("filer", "localhost:8888", "filer hostname:port")
|
|
metaBackup.filerDirectory = cmdFilerMetaBackup.Flag.String("filerDir", "/", "a folder on the filer")
|
|
metaBackup.includePrefixes = cmdFilerMetaBackup.Flag.String("includePrefixes", "", "comma-separated path prefixes to include in backup (if set, only these paths are backed up)")
|
|
metaBackup.excludePrefixes = cmdFilerMetaBackup.Flag.String("excludePrefixes", "", "comma-separated path prefixes to exclude from backup")
|
|
metaBackup.restart = cmdFilerMetaBackup.Flag.Bool("restart", false, "copy the full metadata before async incremental backup")
|
|
metaBackup.backupFilerConfig = cmdFilerMetaBackup.Flag.String("config", "", "path to filer.toml specifying backup filer store")
|
|
metaBackup.clientId = util.RandomInt32()
|
|
}
|
|
|
|
var cmdFilerMetaBackup = &Command{
|
|
UsageLine: "filer.meta.backup [-filer=localhost:8888] [-filerDir=/] [-includePrefixes=...] [-excludePrefixes=...] [-restart] -config=/path/to/backup_filer.toml",
|
|
Short: "continuously backup filer meta data changes to anther filer store specified in a backup_filer.toml",
|
|
Long: `continuously backup filer meta data changes.
|
|
The backup writes to another filer store specified in a backup_filer.toml.
|
|
|
|
weed filer.meta.backup -config=/path/to/backup_filer.toml -filer="localhost:8888"
|
|
weed filer.meta.backup -config=/path/to/backup_filer.toml -filer="localhost:8888" -restart
|
|
|
|
The -includePrefixes and -excludePrefixes flags accept comma-separated path prefixes.
|
|
Paths must be absolute (start with '/'). Matching is at directory boundaries.
|
|
When both match, the deeper prefix wins.
|
|
`,
|
|
}
|
|
|
|
func runFilerMetaBackup(cmd *Command, args []string) bool {
|
|
|
|
util.LoadSecurityConfiguration()
|
|
metaBackup.grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client")
|
|
|
|
// load backup_filer.toml
|
|
v := viper.New()
|
|
v.SetConfigFile(*metaBackup.backupFilerConfig)
|
|
|
|
if err := v.ReadInConfig(); err != nil { // Handle errors reading the config file
|
|
glog.Fatalf("Failed to load %s file: %v\nPlease use this command to generate the a %s.toml file\n"+
|
|
" weed scaffold -config=%s -output=.\n\n\n",
|
|
*metaBackup.backupFilerConfig, err, "backup_filer", "filer")
|
|
}
|
|
|
|
if err := metaBackup.initStore(v); err != nil {
|
|
glog.V(0).Infof("init backup filer store: %v", err)
|
|
return true
|
|
}
|
|
|
|
// Initialize path filter
|
|
metaBackup.pathFilter = util.NewPathPrefixFilter(
|
|
*metaBackup.includePrefixes,
|
|
*metaBackup.excludePrefixes,
|
|
func(format string, args ...interface{}) {
|
|
glog.Warningf(format, args...)
|
|
},
|
|
)
|
|
if metaBackup.pathFilter.HasFilters() {
|
|
if len(metaBackup.pathFilter.GetIncludePrefixes()) > 0 {
|
|
glog.V(0).Infof("including prefixes: %v", metaBackup.pathFilter.GetIncludePrefixes())
|
|
}
|
|
if len(metaBackup.pathFilter.GetExcludePrefixes()) > 0 {
|
|
glog.V(0).Infof("excluding prefixes: %v", metaBackup.pathFilter.GetExcludePrefixes())
|
|
}
|
|
}
|
|
|
|
missingPreviousBackup := false
|
|
_, err := metaBackup.getOffset()
|
|
if err != nil {
|
|
missingPreviousBackup = true
|
|
}
|
|
|
|
if *metaBackup.restart || missingPreviousBackup {
|
|
glog.V(0).Infof("traversing metadata tree...")
|
|
startTime := time.Now()
|
|
if err := metaBackup.traverseMetadata(); err != nil {
|
|
glog.Errorf("traverse meta data: %v", err)
|
|
return true
|
|
}
|
|
glog.V(0).Infof("metadata copied up to %v", startTime)
|
|
if err := metaBackup.setOffset(startTime); err != nil {
|
|
startTime = time.Now()
|
|
}
|
|
}
|
|
|
|
for {
|
|
err := metaBackup.streamMetadataBackup()
|
|
if err != nil {
|
|
glog.Errorf("filer meta backup from %s: %v", *metaBackup.filerAddress, err)
|
|
time.Sleep(1747 * time.Millisecond)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) initStore(v *viper.Viper) error {
|
|
// load configuration for default filer store
|
|
hasDefaultStoreConfigured := false
|
|
for _, store := range filer.Stores {
|
|
if v.GetBool(store.GetName() + ".enabled") {
|
|
store = reflect.New(reflect.ValueOf(store).Elem().Type()).Interface().(filer.FilerStore)
|
|
if err := store.Initialize(v, store.GetName()+"."); err != nil {
|
|
glog.Fatalf("failed to initialize store for %s: %+v", store.GetName(), err)
|
|
}
|
|
glog.V(0).Infof("configured filer store to %s", store.GetName())
|
|
hasDefaultStoreConfigured = true
|
|
metaBackup.store = filer.NewFilerStoreWrapper(store)
|
|
break
|
|
}
|
|
}
|
|
if !hasDefaultStoreConfigured {
|
|
return fmt.Errorf("no filer store enabled in %s", v.ConfigFileUsed())
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// shouldInclude checks if the given path should be included in backup
|
|
// based on the configured include/exclude path prefixes.
|
|
func (metaBackup *FilerMetaBackupOptions) shouldInclude(fullpath string) bool {
|
|
return metaBackup.pathFilter.ShouldInclude(fullpath)
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) traverseMetadata() (err error) {
|
|
var saveErr error
|
|
|
|
traverseErr := filer_pb.TraverseBfs(metaBackup, util.FullPath(*metaBackup.filerDirectory), func(parentPath util.FullPath, entry *filer_pb.Entry) {
|
|
fullpath := string(parentPath.Child(entry.Name))
|
|
if !metaBackup.shouldInclude(fullpath) {
|
|
return
|
|
}
|
|
|
|
println("+", fullpath)
|
|
if err := metaBackup.store.InsertEntry(context.Background(), filer.FromPbEntry(string(parentPath), entry)); err != nil {
|
|
saveErr = fmt.Errorf("insert entry error: %w\n", err)
|
|
return
|
|
}
|
|
|
|
})
|
|
|
|
if traverseErr != nil {
|
|
return fmt.Errorf("traverse: %w", traverseErr)
|
|
}
|
|
return saveErr
|
|
}
|
|
|
|
var (
|
|
MetaBackupKey = []byte("metaBackup")
|
|
)
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) streamMetadataBackup() error {
|
|
|
|
startTime, err := metaBackup.getOffset()
|
|
if err != nil {
|
|
startTime = time.Now()
|
|
}
|
|
glog.V(0).Infof("streaming from %v", startTime)
|
|
|
|
store := metaBackup.store
|
|
|
|
eachEntryFunc := func(resp *filer_pb.SubscribeMetadataResponse) error {
|
|
|
|
ctx := context.Background()
|
|
message := resp.EventNotification
|
|
|
|
if filer_pb.IsEmpty(resp) {
|
|
return nil
|
|
}
|
|
|
|
// Compute exclusion for both old and new paths
|
|
var oldPathExcluded, newPathExcluded bool
|
|
var oldPath, newPath string
|
|
if message.OldEntry != nil {
|
|
oldPath = string(util.FullPath(resp.Directory).Child(message.OldEntry.Name))
|
|
oldPathExcluded = !metaBackup.shouldInclude(oldPath)
|
|
}
|
|
if message.NewEntry != nil {
|
|
newPath = string(util.FullPath(message.NewParentPath).Child(message.NewEntry.Name))
|
|
newPathExcluded = !metaBackup.shouldInclude(newPath)
|
|
}
|
|
|
|
if filer_pb.IsCreate(resp) {
|
|
if newPathExcluded {
|
|
return nil
|
|
}
|
|
println("+", newPath)
|
|
entry := filer.FromPbEntry(message.NewParentPath, message.NewEntry)
|
|
return store.InsertEntry(ctx, entry)
|
|
} else if filer_pb.IsDelete(resp) {
|
|
if oldPathExcluded {
|
|
return nil
|
|
}
|
|
println("-", oldPath)
|
|
return store.DeleteEntry(ctx, util.FullPath(resp.Directory).Child(message.OldEntry.Name))
|
|
} else if filer_pb.IsUpdate(resp) {
|
|
if newPathExcluded {
|
|
return nil
|
|
}
|
|
println("~", newPath)
|
|
entry := filer.FromPbEntry(message.NewParentPath, message.NewEntry)
|
|
return store.UpdateEntry(ctx, entry)
|
|
} else {
|
|
// renaming - handle all four combinations
|
|
if !oldPathExcluded {
|
|
println("-", oldPath)
|
|
if err := store.DeleteEntry(ctx, util.FullPath(resp.Directory).Child(message.OldEntry.Name)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if !newPathExcluded {
|
|
println("+", newPath)
|
|
return store.InsertEntry(ctx, filer.FromPbEntry(message.NewParentPath, message.NewEntry))
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
processEventFnWithOffset := pb.AddOffsetFunc(eachEntryFunc, 3*time.Second, func(counter int64, lastTsNs int64) error {
|
|
lastTime := time.Unix(0, lastTsNs)
|
|
glog.V(0).Infof("meta backup %s progressed to %v %0.2f/sec", *metaBackup.filerAddress, lastTime, float64(counter)/float64(3))
|
|
return metaBackup.setOffset(lastTime)
|
|
})
|
|
|
|
metaBackup.clientEpoch++
|
|
|
|
prefix := *metaBackup.filerDirectory
|
|
if !strings.HasSuffix(prefix, "/") {
|
|
prefix = prefix + "/"
|
|
}
|
|
metadataFollowOption := &pb.MetadataFollowOption{
|
|
ClientName: "meta_backup",
|
|
ClientId: metaBackup.clientId,
|
|
ClientEpoch: metaBackup.clientEpoch,
|
|
SelfSignature: 0,
|
|
PathPrefix: prefix,
|
|
AdditionalPathPrefixes: nil,
|
|
DirectoriesToWatch: nil,
|
|
StartTsNs: startTime.UnixNano(),
|
|
StopTsNs: 0,
|
|
EventErrorType: pb.RetryForeverOnError,
|
|
}
|
|
|
|
return pb.FollowMetadata(pb.ServerAddress(*metaBackup.filerAddress), metaBackup.grpcDialOption, metadataFollowOption, processEventFnWithOffset)
|
|
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) getOffset() (lastWriteTime time.Time, err error) {
|
|
value, err := metaBackup.store.KvGet(context.Background(), MetaBackupKey)
|
|
if err != nil {
|
|
return
|
|
}
|
|
tsNs := util.BytesToUint64(value)
|
|
|
|
return time.Unix(0, int64(tsNs)), nil
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) setOffset(lastWriteTime time.Time) error {
|
|
valueBuf := make([]byte, 8)
|
|
util.Uint64toBytes(valueBuf, uint64(lastWriteTime.UnixNano()))
|
|
|
|
if err := metaBackup.store.KvPut(context.Background(), MetaBackupKey, valueBuf); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
var _ = filer_pb.FilerClient(&FilerMetaBackupOptions{})
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) WithFilerClient(streamingMode bool, fn func(filer_pb.SeaweedFilerClient) error) error {
|
|
|
|
return pb.WithFilerClient(streamingMode, metaBackup.clientId, pb.ServerAddress(*metaBackup.filerAddress), metaBackup.grpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
|
|
return fn(client)
|
|
})
|
|
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) AdjustedUrl(location *filer_pb.Location) string {
|
|
return location.Url
|
|
}
|
|
|
|
func (metaBackup *FilerMetaBackupOptions) GetDataCenter() string {
|
|
return ""
|
|
}
|