-
Notifications
You must be signed in to change notification settings - Fork 441
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Compact dbs manually #6595
Merged
Merged
Compact dbs manually #6595
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2a91ca7
Compact dbs manually
flcl42 51938af
Merge remote-tracking branch 'origin/master' into cleanup-blobs-db
flcl42 e96c3e1
Override Compact instead of new method usage
flcl42 3d5ab6f
Merge remote-tracking branch 'origin/master' into cleanup-blobs-db
flcl42 a55635d
Clean just one db and while not in progress
flcl42 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,7 @@ | |
// SPDX-License-Identifier: LGPL-3.0-only | ||
|
||
using System; | ||
using System.Linq; | ||
using System.Threading.Tasks; | ||
using Nethermind.Blockchain; | ||
using Nethermind.Core; | ||
|
@@ -11,18 +12,20 @@ | |
|
||
namespace Nethermind.Merge.Plugin; | ||
|
||
public class ProcessedTransactionsDbCleaner : IDisposable | ||
public class BlobTransactionsDbCleaner : IDisposable | ||
{ | ||
private readonly IBlockFinalizationManager _finalizationManager; | ||
private readonly IDb _processedTxsDb; | ||
private readonly IColumnsDb<BlobTxsColumns> _db; | ||
private readonly ILogger _logger; | ||
private long _lastFinalizedBlock = 0; | ||
public Task CleaningTask { get; private set; } = Task.CompletedTask; | ||
|
||
public ProcessedTransactionsDbCleaner(IBlockFinalizationManager finalizationManager, IDb processedTxsDb, ILogManager logManager) | ||
public BlobTransactionsDbCleaner(IBlockFinalizationManager finalizationManager, IColumnsDb<BlobTxsColumns> db, ILogManager logManager) | ||
{ | ||
_finalizationManager = finalizationManager ?? throw new ArgumentNullException(nameof(finalizationManager)); | ||
_processedTxsDb = processedTxsDb ?? throw new ArgumentNullException(nameof(processedTxsDb)); | ||
_db = db ?? throw new ArgumentNullException(nameof(db)); | ||
_processedTxsDb = db?.GetColumnDb(BlobTxsColumns.ProcessedTxs) ?? throw new ArgumentNullException(nameof(db)); | ||
_logger = logManager?.GetClassLogger() ?? throw new ArgumentNullException(nameof(logManager)); | ||
|
||
_finalizationManager.BlocksFinalized += OnBlocksFinalized; | ||
|
@@ -55,6 +58,10 @@ private void CleanProcessedTransactionsDb(long newlyFinalizedBlockNumber) | |
|
||
if (_logger.IsDebug) _logger.Debug($"Cleaned processed blob txs from block {_lastFinalizedBlock} to block {newlyFinalizedBlockNumber}"); | ||
|
||
_db.Compact(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shall we only run compaction only after enough transactions were deleted from the db? Put some threshold? |
||
|
||
if (_logger.IsDebug) _logger.Debug($"Blob transactions database columns have been compacted"); | ||
|
||
_lastFinalizedBlock = newlyFinalizedBlockNumber; | ||
} | ||
catch (Exception exception) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we guard the compaction not use to many resources? (Threads? I/O?) So it won't starve anything else in block processing.