* dlm: replace modulo hashing with consistent hash ring Introduce HashRing with virtual nodes (CRC32-based consistent hashing) to replace the modulo-based hashKeyToServer. When a filer node is removed, only keys that hashed to that node are remapped to the next server on the ring, leaving all other mappings stable. This is the foundation for backup replication — the successor on the ring is always the natural takeover node. * dlm: add Generation and IsBackup fields to Lock Lock now carries IsBackup (whether this node holds the lock as a backup replica) and Generation (a monotonic fencing token that increments on each fresh acquisition, stays the same on renewal). Add helper methods: AllLocks, PromoteLock, DemoteLock, InsertBackupLock, RemoveLock, GetLock. * dlm: add ReplicateLock RPC and generation/is_backup proto fields Add generation field to LockResponse for fencing tokens. Add generation and is_backup fields to Lock message. Add ReplicateLock RPC for primary-to-backup lock replication. Add ReplicateLockRequest/ReplicateLockResponse messages. * dlm: add async backup replication to DistributedLockManager Route lock/unlock via consistent hash ring's GetPrimaryAndBackup(). After a successful lock or unlock on the primary, asynchronously replicate the operation to the backup server via ReplicateFunc callback. Single-server deployments skip replication. * dlm: add ReplicateLock handler and backup-aware topology changes Add ReplicateLock gRPC handler for primary-to-backup replication. Revise OnDlmChangeSnapshot to handle three cases on topology change: - Promote backup locks when this node becomes primary - Demote primary locks when this node becomes backup - Transfer locks when this node is neither primary nor backup Wire up SetupDlmReplication during filer server initialization. * dlm: expose generation fencing token in lock client LiveLock now captures the generation from LockResponse and exposes it via Generation() method. Consumers can use this as a fencing token to detect stale lock holders. * dlm: update empty folder cleaner to use consistent hash ring Replace local modulo-based hashKeyToServer with LockRing.GetPrimary() which uses the shared consistent hash ring for folder ownership. * dlm: add unit tests for consistent hash ring Test basic operations, consistency on server removal (only keys from removed server move), backup-is-successor property (backup becomes new primary when primary is removed), and key distribution balance. * dlm: add integration tests for lock replication failure scenarios Test cases: - Primary crash with backup promotion (backup has valid token) - Backup crash with primary continuing - Both primary and backup crash (lock lost, re-acquirable) - Rolling restart across all nodes - Generation fencing token increments on new acquisition - Replication failure (primary still works independently) - Unlock replicates deletion to backup - Lock survives server addition (topology change) - Consistent hashing minimal disruption (only removed server's keys move) * dlm: address PR review findings 1. Causal replication ordering: Add per-lock sequence number (Seq) that increments on every mutation. Backup rejects incoming mutations with seq <= current seq, preventing stale async replications from overwriting newer state. Unlock replication also carries seq and is rejected if stale. 2. Demote-after-handoff: OnDlmChangeSnapshot now transfers the lock to the new primary first and only demotes to backup after a successful TransferLocks RPC. If the transfer fails, the lock stays as primary on this node. 3. SetSnapshot candidateServers leak: Replace the candidateServers map entirely instead of appending, so removed servers don't linger. 4. TransferLocks preserves Generation and Seq: InsertLock now accepts generation and seq parameters. After accepting a transferred lock, the receiving node re-replicates to its backup. 5. Rolling restart test: Add re-replication step after promotion and assert survivedCount > 0. Add TestDLM_StaleReplicationRejected. 6. Mixed-version upgrade note: Add comment on HashRing documenting that all filer nodes must be upgraded together. * dlm: serve renewals locally during transfer window on node join When a new node joins and steals hash ranges from surviving nodes, there's a window between ring update and lock transfer where the client gets redirected to a node that doesn't have the lock yet. Fix: if the ring says primary != self but we still hold the lock locally (non-backup, matching token), serve the renewal/unlock here rather than redirecting. The lock will be transferred by OnDlmChangeSnapshot, and subsequent requests will go to the new primary once the transfer completes. Add tests: - TestDLM_NodeDropAndJoin_OwnershipDisruption: measures disruption when a node drops and a new one joins (14/100 surviving-node locks disrupted, all handled by transfer logic) - TestDLM_RenewalDuringTransferWindow: verifies renewal succeeds on old primary during the transfer window * dlm: master-managed lock ring with stabilization batching The master now owns the lock ring membership. Instead of filers independently reacting to individual ClusterNodeUpdate add/remove events, the master: 1. Tracks filer membership in LockRingManager 2. Batches rapid changes with a 1-second stabilization timer (e.g., a node drop + join within 1 second → single ring update) 3. Broadcasts the complete ring snapshot atomically via the new LockRingUpdate message in KeepConnectedResponse Filers receive the ring as a complete snapshot and apply it via SetSnapshot, ensuring all filers converge to the same ring state without intermediate churn. This eliminates the double-churn problem where a rapid drop+join would fire two separate ring mutations, each triggering lock transfers and disrupting ownership on surviving nodes. * dlm: track ring version, reject stale updates, remove dead code SetSnapshot now takes a version parameter from the master. Stale updates (version < current) are rejected, preventing reordered messages from overwriting a newer ring state. Version 0 is always accepted for bootstrap. Remove AddServer/RemoveServer from LockRing — the ring is now exclusively managed by the master via SetSnapshot. Remove the candidateServers map that was only used by those methods. * dlm: fix SelectLocks data race, advance generation on backup insert - SelectLocks: change RLock to Lock since the function deletes map entries, which is a write operation and causes a data race under RLock. - InsertBackupLock: advance nextGeneration to at least the incoming generation so that after failover promotion, new lock acquisitions get a generation strictly greater than any replicated lock. - Bump replication failure log from V(1) to Warningf for production visibility. * dlm: fix SetSnapshot race, test reliability, timer edge cases - SetSnapshot: hold LockRing lock through both version update and Ring.SetServers() so they're atomic. Prevents a concurrent caller from seeing the new version but applying stale servers. - Transfer window test: search for a key that actually moves primary when filer4 joins, instead of relying on a fixed key that may not. - renewLock redirect: pass the existing token to the new primary instead of empty string, so redirected renewals work correctly. - scheduleBroadcast: check timer.Stop() return value. If the timer already fired, the callback picks up latest state. - FlushPending: only broadcast if timer.Stop() returns true (timer was still pending). If false, the callback is already running. - Fix test comment: "idempotent" → "accepted, state-changing". * dlm: use wall-clock nanoseconds for lock ring version The lock ring version was an in-memory counter that reset to 0 on master restart. A filer that had seen version 5 would reject version 1 from the restarted master. Fix: use time.Now().UnixNano() as the version. This survives master restarts without persistence — the restarted master produces a version greater than any pre-restart value. * dlm: treat expired lock owners as missing Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * dlm: reject stale lock transfers Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * dlm: order replication by generation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * dlm: bootstrap lock ring on reconnect Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
520 lines
16 KiB
Go
520 lines
16 KiB
Go
package empty_folder_cleanup
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/cluster/lock_manager"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
const (
|
|
DefaultMaxCountCheck = 1000
|
|
DefaultCacheExpiry = 5 * time.Minute
|
|
DefaultQueueMaxSize = 1000
|
|
DefaultQueueMaxAge = 5 * time.Second
|
|
DefaultProcessorSleep = 10 * time.Second // How often to check queue
|
|
)
|
|
|
|
// FilerOperations defines the filer operations needed by EmptyFolderCleaner
|
|
type FilerOperations interface {
|
|
CountDirectoryEntries(ctx context.Context, dirPath util.FullPath, limit int) (count int, err error)
|
|
DeleteEntryMetaAndData(ctx context.Context, p util.FullPath, isRecursive, ignoreRecursiveError, shouldDeleteChunks, isFromOtherCluster bool, signatures []int32, ifNotModifiedAfter int64) error
|
|
GetEntryAttributes(ctx context.Context, p util.FullPath) (attributes map[string][]byte, err error)
|
|
IsDirectoryKeyObject(ctx context.Context, p util.FullPath) (bool, error)
|
|
}
|
|
|
|
// folderState tracks the state of a folder for empty folder cleanup
|
|
type folderState struct {
|
|
roughCount int // Cached rough count (up to maxCountCheck)
|
|
lastAddTime time.Time // Last time an item was added
|
|
lastDelTime time.Time // Last time an item was deleted
|
|
lastCheck time.Time // Last time we checked the actual count
|
|
}
|
|
|
|
type bucketCleanupPolicyState struct {
|
|
autoRemove bool
|
|
attrValue string
|
|
lastCheck time.Time
|
|
}
|
|
|
|
// EmptyFolderCleaner handles asynchronous cleanup of empty folders
|
|
// Each filer owns specific folders via consistent hashing based on the peer filer list
|
|
type EmptyFolderCleaner struct {
|
|
filer FilerOperations
|
|
lockRing *lock_manager.LockRing
|
|
host pb.ServerAddress
|
|
|
|
// Folder state tracking
|
|
mu sync.RWMutex
|
|
folderCounts map[string]*folderState // Rough count cache
|
|
bucketCleanupPolicies map[string]*bucketCleanupPolicyState // bucket path -> cleanup policy cache
|
|
|
|
// Cleanup queue (thread-safe, has its own lock)
|
|
cleanupQueue *CleanupQueue
|
|
|
|
// Configuration
|
|
maxCountCheck int // Max items to count (1000)
|
|
cacheExpiry time.Duration // How long to keep cache entries
|
|
processorSleep time.Duration // How often processor checks queue
|
|
bucketPath string // e.g., "/buckets"
|
|
|
|
// Control
|
|
enabled bool
|
|
stopCh chan struct{}
|
|
}
|
|
|
|
// NewEmptyFolderCleaner creates a new EmptyFolderCleaner
|
|
func NewEmptyFolderCleaner(filer FilerOperations, lockRing *lock_manager.LockRing, host pb.ServerAddress, bucketPath string) *EmptyFolderCleaner {
|
|
efc := &EmptyFolderCleaner{
|
|
filer: filer,
|
|
lockRing: lockRing,
|
|
host: host,
|
|
folderCounts: make(map[string]*folderState),
|
|
bucketCleanupPolicies: make(map[string]*bucketCleanupPolicyState),
|
|
cleanupQueue: NewCleanupQueue(DefaultQueueMaxSize, DefaultQueueMaxAge),
|
|
maxCountCheck: DefaultMaxCountCheck,
|
|
cacheExpiry: DefaultCacheExpiry,
|
|
processorSleep: DefaultProcessorSleep,
|
|
bucketPath: bucketPath,
|
|
enabled: true,
|
|
stopCh: make(chan struct{}),
|
|
}
|
|
go efc.cacheEvictionLoop()
|
|
go efc.cleanupProcessor()
|
|
return efc
|
|
}
|
|
|
|
// SetEnabled enables or disables the cleaner
|
|
func (efc *EmptyFolderCleaner) SetEnabled(enabled bool) {
|
|
efc.mu.Lock()
|
|
defer efc.mu.Unlock()
|
|
efc.enabled = enabled
|
|
}
|
|
|
|
// IsEnabled returns whether the cleaner is enabled
|
|
func (efc *EmptyFolderCleaner) IsEnabled() bool {
|
|
efc.mu.RLock()
|
|
defer efc.mu.RUnlock()
|
|
return efc.enabled
|
|
}
|
|
|
|
// ownsFolder checks if this filer owns the folder via consistent hashing
|
|
func (efc *EmptyFolderCleaner) ownsFolder(folder string) bool {
|
|
primary := efc.lockRing.GetPrimary(folder)
|
|
if primary == "" {
|
|
return true // Single filer case or no servers
|
|
}
|
|
return primary == efc.host
|
|
}
|
|
|
|
// OnDeleteEvent is called when a file or directory is deleted
|
|
// Both file and directory deletions count towards making the parent folder empty
|
|
// eventTime is the time when the delete event occurred (for proper ordering)
|
|
func (efc *EmptyFolderCleaner) OnDeleteEvent(directory string, entryName string, isDirectory bool, eventTime time.Time) {
|
|
// Skip if not under bucket path (must be at least /buckets/<bucket>/...)
|
|
if efc.bucketPath != "" && !isUnderBucketPath(directory, efc.bucketPath) {
|
|
return
|
|
}
|
|
|
|
// Check if we own this folder
|
|
if !efc.ownsFolder(directory) {
|
|
glog.V(4).Infof("EmptyFolderCleaner: not owner of %s, skipping", directory)
|
|
return
|
|
}
|
|
|
|
efc.mu.Lock()
|
|
defer efc.mu.Unlock()
|
|
|
|
// Check enabled inside lock to avoid race with Stop()
|
|
if !efc.enabled {
|
|
return
|
|
}
|
|
|
|
glog.V(3).Infof("EmptyFolderCleaner: delete event in %s/%s (isDir=%v)", directory, entryName, isDirectory)
|
|
|
|
// Update cached count (create entry if needed)
|
|
state, exists := efc.folderCounts[directory]
|
|
if !exists {
|
|
state = &folderState{}
|
|
efc.folderCounts[directory] = state
|
|
}
|
|
if state.roughCount > 0 {
|
|
state.roughCount--
|
|
}
|
|
state.lastDelTime = eventTime
|
|
|
|
// Only add to cleanup queue if roughCount suggests folder might be empty
|
|
if state.roughCount > 0 {
|
|
glog.V(3).Infof("EmptyFolderCleaner: skipping queue for %s, roughCount=%d", directory, state.roughCount)
|
|
return
|
|
}
|
|
|
|
// Add to cleanup queue with event time (handles out-of-order events)
|
|
if efc.cleanupQueue.Add(directory, entryName, eventTime) {
|
|
glog.V(3).Infof("EmptyFolderCleaner: queued %s for cleanup (triggered by %s)", directory, entryName)
|
|
}
|
|
}
|
|
|
|
// OnCreateEvent is called when a file or directory is created
|
|
// Both file and directory creations cancel pending cleanup for the parent folder
|
|
func (efc *EmptyFolderCleaner) OnCreateEvent(directory string, entryName string, isDirectory bool) {
|
|
// Skip if not under bucket path (must be at least /buckets/<bucket>/...)
|
|
if efc.bucketPath != "" && !isUnderBucketPath(directory, efc.bucketPath) {
|
|
return
|
|
}
|
|
|
|
efc.mu.Lock()
|
|
defer efc.mu.Unlock()
|
|
|
|
// Check enabled inside lock to avoid race with Stop()
|
|
if !efc.enabled {
|
|
return
|
|
}
|
|
|
|
// Update cached count only if already tracked (no need to track new folders)
|
|
if state, exists := efc.folderCounts[directory]; exists {
|
|
state.roughCount++
|
|
state.lastAddTime = time.Now()
|
|
}
|
|
|
|
// Remove from cleanup queue (cancel pending cleanup)
|
|
if efc.cleanupQueue.Remove(directory) {
|
|
glog.V(3).Infof("EmptyFolderCleaner: cancelled cleanup for %s due to new entry", directory)
|
|
}
|
|
}
|
|
|
|
// cleanupProcessor runs in background and processes the cleanup queue
|
|
func (efc *EmptyFolderCleaner) cleanupProcessor() {
|
|
ticker := time.NewTicker(efc.processorSleep)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-efc.stopCh:
|
|
return
|
|
case <-ticker.C:
|
|
efc.processCleanupQueue()
|
|
}
|
|
}
|
|
}
|
|
|
|
// processCleanupQueue processes items from the cleanup queue
|
|
func (efc *EmptyFolderCleaner) processCleanupQueue() {
|
|
// Check if we should process
|
|
if !efc.cleanupQueue.ShouldProcess() {
|
|
if efc.cleanupQueue.Len() > 0 {
|
|
glog.Infof("EmptyFolderCleaner: pending queue not processed yet (len=%d, oldest_age=%v, max_size=%d, max_age=%v)",
|
|
efc.cleanupQueue.Len(), efc.cleanupQueue.OldestAge(), efc.cleanupQueue.maxSize, efc.cleanupQueue.maxAge)
|
|
}
|
|
return
|
|
}
|
|
|
|
glog.V(3).Infof("EmptyFolderCleaner: processing cleanup queue (len=%d, age=%v)",
|
|
efc.cleanupQueue.Len(), efc.cleanupQueue.OldestAge())
|
|
|
|
// Process all items that are ready
|
|
for efc.cleanupQueue.Len() > 0 {
|
|
// Check if still enabled
|
|
if !efc.IsEnabled() {
|
|
return
|
|
}
|
|
|
|
// Pop the oldest item
|
|
folder, triggeredBy, ok := efc.cleanupQueue.Pop()
|
|
if !ok {
|
|
break
|
|
}
|
|
|
|
// Execute cleanup for this folder
|
|
efc.executeCleanup(folder, triggeredBy)
|
|
}
|
|
}
|
|
|
|
// executeCleanup performs the actual cleanup of an empty folder
|
|
func (efc *EmptyFolderCleaner) executeCleanup(folder string, triggeredBy string) {
|
|
efc.mu.Lock()
|
|
|
|
// Quick check: if we have cached count and it's > 0, skip
|
|
if state, exists := efc.folderCounts[folder]; exists {
|
|
if state.roughCount > 0 {
|
|
glog.V(3).Infof("EmptyFolderCleaner: skipping %s (triggered by %s), cached count=%d", folder, triggeredBy, state.roughCount)
|
|
efc.mu.Unlock()
|
|
return
|
|
}
|
|
// If there was an add after our delete, skip
|
|
if !state.lastAddTime.IsZero() && state.lastAddTime.After(state.lastDelTime) {
|
|
glog.V(3).Infof("EmptyFolderCleaner: skipping %s (triggered by %s), add happened after delete", folder, triggeredBy)
|
|
efc.mu.Unlock()
|
|
return
|
|
}
|
|
}
|
|
efc.mu.Unlock()
|
|
|
|
// Re-check ownership (topology might have changed)
|
|
if !efc.ownsFolder(folder) {
|
|
glog.V(3).Infof("EmptyFolderCleaner: no longer owner of %s (triggered by %s), skipping", folder, triggeredBy)
|
|
return
|
|
}
|
|
|
|
ctx := context.Background()
|
|
bucketPath, autoRemove, source, attrValue, err := efc.getBucketCleanupPolicy(ctx, folder)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return
|
|
}
|
|
glog.V(2).Infof("EmptyFolderCleaner: failed to load bucket cleanup policy for folder %s (triggered by %s): %v", folder, triggeredBy, err)
|
|
return
|
|
}
|
|
|
|
if !autoRemove {
|
|
glog.V(3).Infof("EmptyFolderCleaner: skipping folder %s (triggered by %s), bucket %s auto-remove-empty-folders disabled (source=%s attr=%s)",
|
|
folder, triggeredBy, bucketPath, source, attrValue)
|
|
return
|
|
}
|
|
|
|
// Check if folder is actually empty (count up to maxCountCheck)
|
|
count, err := efc.countItems(ctx, folder)
|
|
if err != nil {
|
|
glog.V(2).Infof("EmptyFolderCleaner: error counting items in %s: %v", folder, err)
|
|
return
|
|
}
|
|
|
|
efc.mu.Lock()
|
|
// Update cache
|
|
if _, exists := efc.folderCounts[folder]; !exists {
|
|
efc.folderCounts[folder] = &folderState{}
|
|
}
|
|
efc.folderCounts[folder].roughCount = count
|
|
efc.folderCounts[folder].lastCheck = time.Now()
|
|
efc.mu.Unlock()
|
|
|
|
if count > 0 {
|
|
glog.V(4).Infof("EmptyFolderCleaner: folder %s (triggered by %s) has %d items, not empty", folder, triggeredBy, count)
|
|
return
|
|
}
|
|
|
|
// Skip explicitly created directory markers (e.g., PUT /bucket/folder/)
|
|
// These have a MIME type set and should be preserved even when empty
|
|
if isKeyObj, err := efc.filer.IsDirectoryKeyObject(ctx, util.FullPath(folder)); err != nil {
|
|
glog.V(2).Infof("EmptyFolderCleaner: error checking directory key object %s: %v", folder, err)
|
|
return
|
|
} else if isKeyObj {
|
|
glog.V(3).Infof("EmptyFolderCleaner: skipping %s (triggered by %s), explicit directory marker", folder, triggeredBy)
|
|
return
|
|
}
|
|
|
|
// Delete the empty folder
|
|
glog.Infof("EmptyFolderCleaner: deleting empty folder %s (triggered by %s)", folder, triggeredBy)
|
|
if err := efc.deleteFolder(ctx, folder); err != nil {
|
|
glog.V(2).Infof("EmptyFolderCleaner: failed to delete empty folder %s (triggered by %s): %v", folder, triggeredBy, err)
|
|
return
|
|
}
|
|
|
|
// Clean up cache entry
|
|
efc.mu.Lock()
|
|
delete(efc.folderCounts, folder)
|
|
efc.mu.Unlock()
|
|
|
|
// Note: No need to recursively check parent folder here.
|
|
// The deletion of this folder will generate a metadata event,
|
|
// which will trigger OnDeleteEvent for the parent folder.
|
|
}
|
|
|
|
// countItems counts items in a folder (up to maxCountCheck)
|
|
func (efc *EmptyFolderCleaner) countItems(ctx context.Context, folder string) (int, error) {
|
|
return efc.filer.CountDirectoryEntries(ctx, util.FullPath(folder), efc.maxCountCheck)
|
|
}
|
|
|
|
// deleteFolder deletes an empty folder
|
|
func (efc *EmptyFolderCleaner) deleteFolder(ctx context.Context, folder string) error {
|
|
return efc.filer.DeleteEntryMetaAndData(ctx, util.FullPath(folder), false, false, false, false, nil, 0)
|
|
}
|
|
|
|
func (efc *EmptyFolderCleaner) getBucketCleanupPolicy(ctx context.Context, folder string) (bucketPath string, autoRemove bool, source string, attrValue string, err error) {
|
|
bucketPath, ok := util.ExtractBucketPath(efc.bucketPath, folder, true)
|
|
if !ok {
|
|
return "", true, "default", "<not_bucket_path>", nil
|
|
}
|
|
|
|
now := time.Now()
|
|
|
|
efc.mu.RLock()
|
|
if state, found := efc.bucketCleanupPolicies[bucketPath]; found && now.Sub(state.lastCheck) <= efc.cacheExpiry {
|
|
efc.mu.RUnlock()
|
|
return bucketPath, state.autoRemove, "cache", state.attrValue, nil
|
|
}
|
|
efc.mu.RUnlock()
|
|
|
|
attrs, err := efc.filer.GetEntryAttributes(ctx, util.FullPath(bucketPath))
|
|
if err != nil {
|
|
return "", true, "", "", err
|
|
}
|
|
|
|
autoRemove, attrValue = autoRemoveEmptyFoldersEnabled(attrs)
|
|
|
|
efc.mu.Lock()
|
|
if efc.bucketCleanupPolicies == nil {
|
|
efc.bucketCleanupPolicies = make(map[string]*bucketCleanupPolicyState)
|
|
}
|
|
efc.bucketCleanupPolicies[bucketPath] = &bucketCleanupPolicyState{
|
|
autoRemove: autoRemove,
|
|
attrValue: attrValue,
|
|
lastCheck: now,
|
|
}
|
|
efc.mu.Unlock()
|
|
|
|
return bucketPath, autoRemove, "filer", attrValue, nil
|
|
}
|
|
|
|
func autoRemoveEmptyFoldersEnabled(attrs map[string][]byte) (bool, string) {
|
|
if attrs == nil {
|
|
return true, "<no_attrs>"
|
|
}
|
|
|
|
value, found := attrs[s3_constants.ExtAllowEmptyFolders]
|
|
if !found {
|
|
return true, "<missing>"
|
|
}
|
|
|
|
text := strings.TrimSpace(string(value))
|
|
if text == "" {
|
|
return true, "<empty>"
|
|
}
|
|
|
|
return !strings.EqualFold(text, "true"), text
|
|
}
|
|
|
|
// isUnderPath checks if child is under parent path
|
|
func isUnderPath(child, parent string) bool {
|
|
if parent == "" || parent == "/" {
|
|
return true
|
|
}
|
|
// Ensure parent ends without slash for proper prefix matching
|
|
if len(parent) > 0 && parent[len(parent)-1] == '/' {
|
|
parent = parent[:len(parent)-1]
|
|
}
|
|
// Child must start with parent and then have a / or be exactly parent
|
|
if len(child) < len(parent) {
|
|
return false
|
|
}
|
|
if child[:len(parent)] != parent {
|
|
return false
|
|
}
|
|
if len(child) == len(parent) {
|
|
return true
|
|
}
|
|
return child[len(parent)] == '/'
|
|
}
|
|
|
|
// isUnderBucketPath checks if directory is inside a bucket (under /buckets/<bucket>/...)
|
|
// This ensures we only clean up folders inside buckets, not the buckets themselves
|
|
func isUnderBucketPath(directory, bucketPath string) bool {
|
|
if bucketPath == "" {
|
|
return true
|
|
}
|
|
// Ensure bucketPath ends without slash
|
|
if len(bucketPath) > 0 && bucketPath[len(bucketPath)-1] == '/' {
|
|
bucketPath = bucketPath[:len(bucketPath)-1]
|
|
}
|
|
// Directory must be under bucketPath
|
|
if !isUnderPath(directory, bucketPath) {
|
|
return false
|
|
}
|
|
// Directory must be at least /buckets/<bucket>/<something>
|
|
// i.e., depth must be at least bucketPath depth + 2
|
|
// For /buckets (depth 1), we need at least /buckets/mybucket/folder (depth 3)
|
|
bucketPathDepth := strings.Count(bucketPath, "/")
|
|
directoryDepth := strings.Count(directory, "/")
|
|
return directoryDepth >= bucketPathDepth+2
|
|
}
|
|
|
|
// cacheEvictionLoop periodically removes stale entries from folderCounts
|
|
func (efc *EmptyFolderCleaner) cacheEvictionLoop() {
|
|
ticker := time.NewTicker(efc.cacheExpiry)
|
|
defer ticker.Stop()
|
|
|
|
for {
|
|
select {
|
|
case <-efc.stopCh:
|
|
return
|
|
case <-ticker.C:
|
|
efc.evictStaleCacheEntries()
|
|
}
|
|
}
|
|
}
|
|
|
|
// evictStaleCacheEntries removes cache entries that haven't been accessed recently
|
|
func (efc *EmptyFolderCleaner) evictStaleCacheEntries() {
|
|
efc.mu.Lock()
|
|
defer efc.mu.Unlock()
|
|
|
|
now := time.Now()
|
|
expiredCount := 0
|
|
for folder, state := range efc.folderCounts {
|
|
// Skip if folder is in cleanup queue
|
|
if efc.cleanupQueue.Contains(folder) {
|
|
continue
|
|
}
|
|
|
|
// Find the most recent activity time for this folder
|
|
lastActivity := state.lastCheck
|
|
if state.lastAddTime.After(lastActivity) {
|
|
lastActivity = state.lastAddTime
|
|
}
|
|
if state.lastDelTime.After(lastActivity) {
|
|
lastActivity = state.lastDelTime
|
|
}
|
|
|
|
// Evict if no activity within cache expiry period
|
|
if now.Sub(lastActivity) > efc.cacheExpiry {
|
|
delete(efc.folderCounts, folder)
|
|
expiredCount++
|
|
}
|
|
}
|
|
|
|
for bucketPath, state := range efc.bucketCleanupPolicies {
|
|
if now.Sub(state.lastCheck) > efc.cacheExpiry {
|
|
delete(efc.bucketCleanupPolicies, bucketPath)
|
|
}
|
|
}
|
|
|
|
if expiredCount > 0 {
|
|
glog.V(3).Infof("EmptyFolderCleaner: evicted %d stale cache entries", expiredCount)
|
|
}
|
|
}
|
|
|
|
// Stop stops the cleaner and cancels all pending tasks
|
|
func (efc *EmptyFolderCleaner) Stop() {
|
|
close(efc.stopCh)
|
|
|
|
efc.mu.Lock()
|
|
defer efc.mu.Unlock()
|
|
|
|
efc.enabled = false
|
|
efc.cleanupQueue.Clear()
|
|
efc.folderCounts = make(map[string]*folderState) // Clear cache on stop
|
|
efc.bucketCleanupPolicies = make(map[string]*bucketCleanupPolicyState)
|
|
}
|
|
|
|
// GetPendingCleanupCount returns the number of pending cleanup tasks (for testing)
|
|
func (efc *EmptyFolderCleaner) GetPendingCleanupCount() int {
|
|
return efc.cleanupQueue.Len()
|
|
}
|
|
|
|
// GetCachedFolderCount returns the cached count for a folder (for testing)
|
|
func (efc *EmptyFolderCleaner) GetCachedFolderCount(folder string) (int, bool) {
|
|
efc.mu.RLock()
|
|
defer efc.mu.RUnlock()
|
|
if state, exists := efc.folderCounts[folder]; exists {
|
|
return state.roughCount, true
|
|
}
|
|
return 0, false
|
|
}
|