* fix LevelDB panic on lazy reload Implemented a thread-safe reload mechanism using double-checked locking and a retry loop in Get, Put, and Delete. Added a concurrency test to verify the fix and prevent regressions. Fixes #8269 * refactor: use helper for leveldb fix and remove deprecated ioutil * fix: prevent deadlock by using getFromDb helper Extracted DB lookup to internal helper to avoid recursive RLock in Put/Delete methods. Updated Get to use the helper as well. * fix: resolve syntax error and commit deadlock prevention Fixed a duplicate function declaration syntax error. Verified that getFromDb helper correctly prevents recursive RLock scenarios. * refactor: remove redundant timeout checks Removed nested `if m.ldbTimeout > 0` checks in Get, Put, and Delete methods as suggested in PR review.
This commit is contained in:
@@ -132,15 +132,17 @@ func generateLevelDbFile(dbFileName string, indexFile *os.File) error {
|
||||
}
|
||||
|
||||
func (m *LevelDbNeedleMap) Get(key NeedleId) (element *needle_map.NeedleValue, ok bool) {
|
||||
bytes := make([]byte, NeedleIdSize)
|
||||
if m.ldbTimeout > 0 {
|
||||
m.ldbAccessLock.RLock()
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
loadErr := reloadLdb(m)
|
||||
if loadErr != nil {
|
||||
if err := m.ensureLdbLoaded(); err != nil {
|
||||
return nil, false
|
||||
}
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
}
|
||||
return m.getFromDb(key)
|
||||
}
|
||||
|
||||
func (m *LevelDbNeedleMap) getFromDb(key NeedleId) (element *needle_map.NeedleValue, ok bool) {
|
||||
bytes := make([]byte, NeedleIdSize)
|
||||
NeedleIdToBytes(bytes[0:NeedleIdSize], key)
|
||||
data, err := m.db.Get(bytes, nil)
|
||||
if err != nil || len(data) != OffsetSize+SizeSize {
|
||||
@@ -155,14 +157,12 @@ func (m *LevelDbNeedleMap) Put(key NeedleId, offset Offset, size Size) error {
|
||||
var oldSize Size
|
||||
var watermark uint64
|
||||
if m.ldbTimeout > 0 {
|
||||
m.ldbAccessLock.RLock()
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
loadErr := reloadLdb(m)
|
||||
if loadErr != nil {
|
||||
return loadErr
|
||||
if err := m.ensureLdbLoaded(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
}
|
||||
if oldNeedle, ok := m.Get(key); ok {
|
||||
if oldNeedle, ok := m.getFromDb(key); ok {
|
||||
oldSize = oldNeedle.Size
|
||||
}
|
||||
m.logPut(key, oldSize, size)
|
||||
@@ -222,14 +222,12 @@ func levelDbDelete(db *leveldb.DB, key NeedleId) error {
|
||||
func (m *LevelDbNeedleMap) Delete(key NeedleId, offset Offset) error {
|
||||
var watermark uint64
|
||||
if m.ldbTimeout > 0 {
|
||||
m.ldbAccessLock.RLock()
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
loadErr := reloadLdb(m)
|
||||
if loadErr != nil {
|
||||
return loadErr
|
||||
if err := m.ensureLdbLoaded(); err != nil {
|
||||
return err
|
||||
}
|
||||
defer m.ldbAccessLock.RUnlock()
|
||||
}
|
||||
oldNeedle, found := m.Get(key)
|
||||
oldNeedle, found := m.getFromDb(key)
|
||||
if !found || oldNeedle.Size.IsDeleted() {
|
||||
return nil
|
||||
}
|
||||
@@ -400,6 +398,24 @@ func (m *LevelDbNeedleMap) DoOffsetLoading(v *Volume, indexFile *os.File, startF
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *LevelDbNeedleMap) ensureLdbLoaded() error {
|
||||
for {
|
||||
m.ldbAccessLock.RLock()
|
||||
if m.db != nil {
|
||||
return nil
|
||||
}
|
||||
m.ldbAccessLock.RUnlock()
|
||||
m.ldbAccessLock.Lock()
|
||||
if m.db == nil {
|
||||
if err := reloadLdb(m); err != nil {
|
||||
m.ldbAccessLock.Unlock()
|
||||
return err
|
||||
}
|
||||
}
|
||||
m.ldbAccessLock.Unlock()
|
||||
}
|
||||
}
|
||||
|
||||
func reloadLdb(m *LevelDbNeedleMap) (err error) {
|
||||
if m.db != nil {
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user