add LimitMempoolSize logic for mempool #179
Merged
Conversation
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
wolfstudy
added
help wanted
qiwei9743
reviewed
Nov 1, 2018
| @@ -72,6 +73,16 @@ func (coinsCache *CoinsLruCache) HaveCoin(point *outpoint.OutPoint) bool { | |||
| return coin != nil && !coin.IsSpent() | |||
| } | |||
|
|
|||
| func (coinsCache *CoinsLruCache) RemoveCoins(point *outpoint.OutPoint) error { | |||
| coinsCache.cacheCoins.Remove(*point) | |||
There was a problem hiding this comment.
Can we check whether point exists in cache and do a log before removing it?
| coinsTipHash, _ := coinsTip.GetBestBlock() | ||
| coinsTipHash, err := coinsTip.GetBestBlock() | ||
| if err != nil { | ||
| log.Error("get best block error:%s", err.Error()) |
There was a problem hiding this comment.
return an error on error?
| @@ -164,6 +164,7 @@ func RemoveForReorg(nMemPoolHeight int32, flag int) { | |||
| pool.CalculateDescendants(it, allRemoves) | |||
| } | |||
| pool.RemoveStaged(allRemoves, false, mempool.REORG) | |||
| pool.LimitMempoolSize(conf.Cfg.Mempool.MaxPoolSize, int64(conf.Cfg.Mempool.MaxPoolExpiry)*60*60) | |||
There was a problem hiding this comment.
There is no reason to do trim when a TX is evicted from pool. Whey should we trim it after removing some?
| @@ -128,6 +128,7 @@ func (m *TxMempool) AddTx(txEntry *TxEntry, ancestors map[*TxEntry]struct{}) err | |||
| if txEntry.SumTxCountWithAncestors == 1 { | |||
| m.rootTx[txEntry.Tx.GetHash()] = txEntry | |||
| } | |||
| m.LimitMempoolSize(conf.Cfg.Mempool.MaxPoolSize, int64(conf.Cfg.Mempool.MaxPoolExpiry)*60*60) | |||
There was a problem hiding this comment.
Newly added tx may be evicted. We should check whether it still exists to return different error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@qiwei9743 @ludete @fffreedom PTAL