chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-02 20:40:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #859 from shunkakinoki/fix/objectstore-sync-race-condition

Browse Source 
fix: prevent race condition in objectstore auth sync
This commit is contained in:
Luis Pater
2026-02-01 07:01:43 +08:00
committed by GitHub
parent 3b04e11544 bc32096e9c
commit 69ca0a8fac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/store/objectstore.go
View File

@@ -386,11 +386,12 @@ func (s *ObjectTokenStore) syncConfigFromBucket(ctx context.Context, example str
} }
func (s *ObjectTokenStore) syncAuthFromBucket(ctx context.Context) error { func (s *ObjectTokenStore) syncAuthFromBucket(ctx context.Context) error {
if err := os.RemoveAll(s.authDir); err != nil { // NOTE: We intentionally do NOT use os.RemoveAll here.
return fmt.Errorf("object store: reset auth directory: %w", err) // Wiping the directory triggers file watcher delete events, which then
} // propagate deletions to the remote object store (race condition).
// Instead, we just ensure the directory exists and overwrite files incrementally.
if err := os.MkdirAll(s.authDir, 0o700); err != nil { if err := os.MkdirAll(s.authDir, 0o700); err != nil {
return fmt.Errorf("object store: recreate auth directory: %w", err) return fmt.Errorf("object store: create auth directory: %w", err)
} }
prefix := s.prefixedKey(objectStoreAuthPrefix + "/") prefix := s.prefixedKey(objectStoreAuthPrefix + "/")