Fix inconsistency state before commit #1709
Conversation
| @@ -481,6 +471,7 @@ where | |||
| ); | |||
| stats.increment_errored_txs(); | |||
|
|
|||
| self.wl_storage.drop_tx(); | |||
There was a problem hiding this comment.
Does this only drop the current tx or does it clear the entire wl_storage? From reading the wl_storage code I'm not entirely sure.
| .delete(&tx_hash_key) | ||
| .expect( | ||
| "Error while deleting tx hash key from storage", | ||
| ); | ||
| // Apply only to remove its hash, | ||
| // since all other changes have already been dropped | ||
| self.wl_storage.commit_tx(); |
There was a problem hiding this comment.
it is to commit the removal of the tx_hash_key above
There was a problem hiding this comment.
Yes, it's a bit tricky. But we have to commit_tx() to apply changes on the write log when the following commit phase.
|
|
||
| // the merkle tree root should not change after finalize_block | ||
| let root_post = shell.shell.wl_storage.storage.block.tree.root(); | ||
| assert_eq!(root_pre.0, root_post.0); |
There was a problem hiding this comment.
when I remove the fixes and run the tests they do not yet catch the issue - I think we need to add some txs in here
|
|
||
| /// Make a wrapper tx and a processed tx from the wrapped tx that can be | ||
| /// added to `FinalizeBlock` request. | ||
| fn mk_wrapper_tx( |
There was a problem hiding this comment.
nit: can these helper functions go to the top of the module? Otherwise people have to read the code from the bottom up (as I currently am)
tzemanovic
force-pushed
the
yuji/fix_changes_before_commit
branch
from
7207fa9 to
d87df2a
Compare
|
auto-squashed fixups (no diff) |
* yuji/fix_changes_before_commit: test/shell/finalize_block: add some txs to DB commit test add changelog fix changes in finalize_block
In
finalize_block, some data are written into the storage directly and a new epoch is updated in the Merkle tree when the new epoch starts before the commit.It could cause an inconsistent state when shutdown in
finalize_blockand then restarting.