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

[1.0.3] Fix flaky nodeos_snapshot_diff_test due to a race condition #875

Merged
merged 4 commits into from
Oct 3, 2024
Merged

[1.0.3] Fix flaky nodeos_snapshot_diff_test due to a race condition #875

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d6386
Fix flaky nodeos_snapshot_diff_test due to a race condition
linh2931 Oct 2, 2024
f5ef651
Merge branch 'release/1.0' into snapshot_diff_test_fix
linh2931 Oct 2, 2024
8dc0d62
Do not use allowed-none to isolate as it does not allow future connect
linh2931 Oct 3, 2024
f67ca30
Merge branch 'release/1.0' into snapshot_diff_test_fix
linh2931 Oct 3, 2024
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
16 changes: 16 additions & 0 deletions tests/nodeos_snapshot_diff_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,34 @@ def waitForBlock(node, blockNum, blockType=BlockType.head, timeout=None, reportI
Utils.processSpringUtilCmd("snapshot to-json --input-file {}".format(snapshotFile), "snapshot to-json", silentErrors=False)
snapshotFile = snapshotFile + ".json"

# There is a race condition that at the startup of node, net thread and http
# thread can start to work in different order. If http thread processes schedule_snapshot
# request after net thread starts to sync with the irrNode, schedule_snapshot
# request will miss the scheduled block number. If it is before net thread
# starts to sync with the irrNode, schedule_snapshot request will catch the
# scheduled block number and the snapshot is taken.

# Shut down irreversible node so that nodeProg won't sync up when starting up
Print("Kill irreversible node")
nodeIrr.kill(signal.SIGTERM)

Print("Trim programmable blocklog to snapshot head block num and relaunch programmable node")
nodeProg.kill(signal.SIGTERM)
output=cluster.getBlockLog(progNodeId, blockLogAction=BlockLogAction.trim, first=0, last=ret_head_block_num, throwException=True)
nodeProg.removeState()
nodeProg.rmFromCmd('--p2p-peer-address')

isRelaunchSuccess = nodeProg.relaunch(chainArg="--replay", addSwapFlags={}, timeout=relaunchTimeout)
assert isRelaunchSuccess, "Failed to relaunch programmable node"

Print("Schedule snapshot (node 2)")
ret = nodeProg.scheduleSnapshotAt(ret_head_block_num)
assert ret is not None, "Snapshot scheduling failed"

# Start irreversible node so that nodeProg can sync up with it
Print("Restart irreversible node")
nodeIrr.relaunch()

Print("Wait for programmable node lib to advance")
waitForBlock(nodeProg, ret_head_block_num, blockType=BlockType.lib)

Expand Down