Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Create only one snapshot for persist #1602

Merged
merged 20 commits into from
May 16, 2020
Merged

Create only one snapshot for persist #1602

Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d3a9adf
Create only one snapshot for persist
Apr 23, 2020
c3310ff
Add vm fault handler
Apr 23, 2020
6220b56
Code optimization
Apr 23, 2020
4d1f452
Merge branch 'master' into create_only_one_snapshot_for_persist
Qiao-Jin Apr 26, 2020
a326107
Merge branch 'master' into create_only_one_snapshot_for_persist
shargon Apr 27, 2020
cce60d5
Add TODO comment to warn future delete case
Apr 29, 2020
21f39b4
Write into cloned snapshot instead of snapshot during persist
Apr 29, 2020
a4eaea0
Update comment
Apr 29, 2020
cf01de0
Employ Func Datacache.AddAndCommit
Apr 29, 2020
f446dfb
Merge branch 'master' into create_only_one_snapshot_for_persist
shargon Apr 30, 2020
7446c34
Merge branch 'master' into create_only_one_snapshot_for_persist
Qiao-Jin May 6, 2020
577eb51
Merge branch 'master' into create_only_one_snapshot_for_persist
May 8, 2020
76682a9
remove AddAndCommit
May 8, 2020
37e5b04
Merge branch 'master' into create_only_one_snapshot_for_persist
erikzhang May 8, 2020
2de4df0
Add fault transaction testcase
May 11, 2020
5000d8c
Fault transaction state test
May 12, 2020
375a094
Merge branch 'master' into create_only_one_snapshot_for_persist
Qiao-Jin May 12, 2020
334adc5
fix ut
Tommo-L May 12, 2020
a111535
format
Tommo-L May 12, 2020
be785d7
Merge branch 'master' into create_only_one_snapshot_for_persist
erikzhang May 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/neo/Ledger/Blockchain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ private void Persist(Block block)
}
}
snapshot.Blocks.Add(block.Hash, block.Trim());
StoreView clonedSnapshot = snapshot.Clone();
foreach (Transaction tx in block.Transactions)
{
var state = new TransactionState
Expand All @@ -498,13 +499,17 @@ private void Persist(Block block)

snapshot.Transactions.Add(tx.Hash, state);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You added a new record to the snapshot after Clone(). It may be safe now, but I am not sure if it will cause problems in the future. For example, cache non-existent records.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right. Maybe adding a todo comment to warn developer for future modification can help.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it conflicts with the cache to the non-existent keys. Maybe we should test which one is better first?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have updated the writing logic here & should be able to avoid such occasions:)


using (ApplicationEngine engine = new ApplicationEngine(TriggerType.Application, tx, snapshot.Clone(), tx.SystemFee))
using (ApplicationEngine engine = new ApplicationEngine(TriggerType.Application, tx, clonedSnapshot, tx.SystemFee))
{
engine.LoadScript(tx.Script);
state.VMState = engine.Execute();
shargon marked this conversation as resolved.
Show resolved Hide resolved
if (state.VMState == VMState.HALT)
{
engine.Snapshot.Commit();
clonedSnapshot.Commit();
shargon marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
clonedSnapshot = snapshot.Clone();
}
ApplicationExecuted application_executed = new ApplicationExecuted(engine);
Context.System.EventStream.Publish(application_executed);
Expand Down