Merge pull request #1738 from qieqieplus/rocksdb

fix rocksdb crash when list directory

1 files changed, 4 insertions, 14 deletions

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