Browse Source

Close storage objects before cleaning (#16934) (#16942)

Backport #16934

Storage.Iterate provides the path and an open object. On windows using
local storage means that the objects will be locked thus preventing clean
from deleting them.

This PR simply closes the objects early.

Fix #16932

Signed-off-by: Andrew Thornton <art27@cantab.net>
tags/v1.15.2
zeripath 2 years ago
parent
commit
5cb5101720
No account linked to committer's email address
1 changed files with 1 additions and 0 deletions
  1. 1
    0
      modules/storage/storage.go

+ 1
- 0
modules/storage/storage.go View File

@@ -91,6 +91,7 @@ func Copy(dstStorage ObjectStorage, dstPath string, srcStorage ObjectStorage, sr
// Clean delete all the objects in this storage
func Clean(storage ObjectStorage) error {
return storage.IterateObjects(func(path string, obj Object) error {
_ = obj.Close()
return storage.Delete(path)
})
}

Loading…
Cancel
Save