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 #1735 from qieqieplus/rocksdb

Browse source 
ignore decode error for non-entry data
This commit is contained in:
Chris Lu 2021-01-06 02:22:18 -08:00 committed by GitHub
parent f579838917 0764fccde7
commit 95ecf0c72f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
weed/filer/rocksdb/rocksdb_ttl.go
View file

@ -23,17 +23,16 @@ func NewTTLFilter() gorocksdb.CompactionFilter {
func (t *TTLFilter) Filter(level int, key, val []byte) (remove bool, newVal []byte) { func (t *TTLFilter) Filter(level int, key, val []byte) (remove bool, newVal []byte) {
// decode could be slow, causing write stall // decode could be slow, causing write stall
// level >0 sst can run compaction in parallel // level >0 sst can run compaction in parallel
if t.skipLevel0 && level == 0 { if !t.skipLevel0 || level > 0 {
return false, val
}
entry := filer.Entry{} entry := filer.Entry{}
if err := entry.DecodeAttributesAndChunks(val); err == nil { if err := entry.DecodeAttributesAndChunks(val); err == nil {
if entry.TtlSec == 0 || if entry.TtlSec > 0 &&
entry.Crtime.Add(time.Duration(entry.TtlSec)*time.Second).After(time.Now()) { entry.Crtime.Add(time.Duration(entry.TtlSec)*time.Second).Before(time.Now()) {
return false, val
}
}
return true, nil return true, nil
}
}
}
return false, val
} }
func (t *TTLFilter) Name() string { func (t *TTLFilter) Name() string {