mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-11-25 03:29:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

shell: fs.meta.save missed directory data with more than 1024 entries

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/1130
This commit is contained in:
Chris Lu 2019-11-22 01:39:50 -08:00
parent 4f3adcb5ab
commit fb3c9ed80d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
weed/server/filer_grpc_server.go
View File

@ -40,11 +40,16 @@ func (fs *FilerServer) ListEntries(ctx context.Context, req *filer_pb.ListEntrie
limit = fs.option.DirListingLimit limit = fs.option.DirListingLimit
} }
paginationLimit := 1024
if limit < paginationLimit {
paginationLimit = limit
}
resp := &filer_pb.ListEntriesResponse{} resp := &filer_pb.ListEntriesResponse{}
lastFileName := req.StartFromFileName lastFileName := req.StartFromFileName
includeLastFile := req.InclusiveStartFrom includeLastFile := req.InclusiveStartFrom
for limit > 0 { for limit > 0 {
entries, err := fs.filer.ListDirectoryEntries(ctx, filer2.FullPath(req.Directory), lastFileName, includeLastFile, 1024) entries, err := fs.filer.ListDirectoryEntries(ctx, filer2.FullPath(req.Directory), lastFileName, includeLastFile, paginationLimit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -71,9 +76,12 @@ func (fs *FilerServer) ListEntries(ctx context.Context, req *filer_pb.ListEntrie
Attributes: filer2.EntryAttributeToPb(entry), Attributes: filer2.EntryAttributeToPb(entry),
}) })
limit-- limit--
if limit == 0 {
return resp, nil
}
} }
if len(resp.Entries) < 1024 { if len(entries) < paginationLimit {
break break
} }