Merge pull request #2099 from skalenetwork/bug/2098-fix-memory-leak

skalenetwork · Feb 12, 2025 · ed2ff59 · ed2ff59
2 parents 1a5fcca + 000a2cc
commit ed2ff59
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/libdevcore/LevelDB.cpp b/libdevcore/LevelDB.cpp
@@ -154,6 +154,7 @@ uint64_t LevelDB::getCurrentTimeMs() {
 }
 
 LevelDB::~LevelDB() {
+    m_snapManager.closeAllOpenSnaps( m_db, m_dbReopenId );
     if ( m_db )
         m_db.reset();
     if ( m_options.filter_policy )

diff --git a/libdevcore/LevelDBSnapManager.cpp b/libdevcore/LevelDBSnapManager.cpp
@@ -73,6 +73,17 @@ uint64_t LevelDBSnapManager::garbageCollectUnusedOldSnaps(
     return mapSizeAfterCleanup;
 }
 
+void LevelDBSnapManager::closeAllOpenSnaps(
+    std::unique_ptr< leveldb::DB >& _db, uint64_t _dbInstanceId ) {
+    std::unique_lock< std::shared_mutex > snapLock( m_snapMutex );
+    for ( auto&& snap : oldSnaps ) {
+        LDB_CHECK( snap.second );
+        snap.second->close( _db, _dbInstanceId );
+    }
+    if ( m_lastBlockSnap )
+        m_lastBlockSnap->close( _db, _dbInstanceId );
+}
+
 
 // this will be called from EVM processing thread just after the block is processed
 void LevelDBSnapManager::addSnapForBlock(