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

Merge pull request #1738 from qieqieplus/rocksdb

Browse source 
fix rocksdb crash when list directory
This commit is contained in:
Chris Lu 2021-01-07 02:26:41 -08:00 committed by GitHub
parent e327385644 0f18592315
commit 07f4703bfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
weed/filer/rocksdb/rocksdb_store.go
View file

@ -181,18 +181,12 @@ func enumerate(iter *gorocksdb.Iterator, prefix, lastKey []byte, includeLastKey
iter.Seek(prefix) iter.Seek(prefix)
} else { } else {
iter.Seek(lastKey) iter.Seek(lastKey)
if !includeLastKey { if !includeLastKey {
key := iter.Key().Data() if iter.Valid() {
if bytes.Equal(iter.Key().Data(), lastKey) {
if !bytes.HasPrefix(key, prefix) { iter.Next()
return nil }
} }
if bytes.Equal(key, lastKey) {
iter.Next()
}
} }
} }
@ -250,10 +244,6 @@ func (store *RocksDBStore) ListDirectoryPrefixedEntries(ctx context.Context, ful
if fileName == "" { if fileName == "" {
return true return true
} }
limit--
if limit < 0 {
return false
}
entry := &filer.Entry{ entry := &filer.Entry{
FullPath: weed_util.NewFullPath(string(fullpath), fileName), FullPath: weed_util.NewFullPath(string(fullpath), fileName),
} }