gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

filer: Redis cleanly delete directory

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1448
This commit is contained in:
Chris Lu 2020-09-03 19:17:39 -07:00
parent b8f32bcab9
commit 44b4ebf0ff
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/filer/redis2/universal_redis_store.go
View file

@ -85,8 +85,12 @@ func (store *UniversalRedis2Store) FindEntry(ctx context.Context, fullpath util.
func (store *UniversalRedis2Store) DeleteEntry(ctx context.Context, fullpath util.FullPath) (err error) { func (store *UniversalRedis2Store) DeleteEntry(ctx context.Context, fullpath util.FullPath) (err error) {
_, err = store.Client.Del(string(fullpath)).Result() _, err = store.Client.Del(genDirectoryListKey(string(fullpath))).Result()
if err != nil {
return fmt.Errorf("delete dir list %s : %v", fullpath, err)
}
_, err = store.Client.Del(string(fullpath)).Result()
if err != nil { if err != nil {
return fmt.Errorf("delete %s : %v", fullpath, err) return fmt.Errorf("delete %s : %v", fullpath, err)
} }
@ -95,7 +99,7 @@ func (store *UniversalRedis2Store) DeleteEntry(ctx context.Context, fullpath uti
if name != "" { if name != "" {
_, err = store.Client.ZRem(genDirectoryListKey(dir), name).Result() _, err = store.Client.ZRem(genDirectoryListKey(dir), name).Result()
if err != nil { if err != nil {
return fmt.Errorf("delete %s in parent dir: %v", fullpath, err) return fmt.Errorf("DeleteEntry %s in parent dir: %v", fullpath, err)
} }
} }
@ -106,14 +110,14 @@ func (store *UniversalRedis2Store) DeleteFolderChildren(ctx context.Context, ful
members, err := store.Client.ZRange(genDirectoryListKey(string(fullpath)), 0, -1).Result() members, err := store.Client.ZRange(genDirectoryListKey(string(fullpath)), 0, -1).Result()
if err != nil { if err != nil {
return fmt.Errorf("delete folder %s : %v", fullpath, err) return fmt.Errorf("DeleteFolderChildren %s : %v", fullpath, err)
} }
for _, fileName := range members { for _, fileName := range members {
path := util.NewFullPath(string(fullpath), fileName) path := util.NewFullPath(string(fullpath), fileName)
_, err = store.Client.Del(string(path)).Result() _, err = store.Client.Del(string(path)).Result()
if err != nil { if err != nil {
return fmt.Errorf("delete %s in parent dir: %v", fullpath, err) return fmt.Errorf("DeleteFolderChildren %s in parent dir: %v", fullpath, err)
} }
} }