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

[cp][aptos-release-v1.26] Fix state merkle truncate #15808

Merged
merged 1 commit into from
Jan 24, 2025
Merged

[cp][aptos-release-v1.26] Fix state merkle truncate #15808

merged 1 commit into from
Jan 24, 2025

Conversation

github-actions[bot]
Copy link
Contributor

Backport

This will backport the following commits from main to aptos-release-v1.26:

Questions ?

Please refer to the Backport tool documentation

@msmouse
Fix state merkle truncate (#15800)
f4d3026 
in case of a partial commit on a unsharded state db, two things were
wrong:
1. when we see a partial version, we need to look at the previous version before jumping the the epoch boundary (we forgot to substract 1 from the version)
2. the ledger meta db were not passed in as intended (instead, we passed
   the state merkle meta db)

The test_db_restart smoke test does catch this sometimes but it's not
easy to trigger. I bumpped the number of restarts on that test.

(cherry picked from commit f3d4dba)
@trunk-io Trunk.io
Copy link

trunk-io bot commented Jan 24, 2025 •
edited
Loading

⏱️ 1h 14m total CI duration on this PR
Slowest 15 Jobs Cumulative Duration Recent Runs
rust-unit-tests 24m 🟩 
execution-performance / single-node-performance 14m 🟥 🟥 
forge-e2e-test / forge 13m 🟩 
rust-doc-tests 5m 🟩 
execution-performance / test-target-determinator 5m 🟩 
test-target-determinator 5m 🟩 
rust-cargo-deny 2m 🟩 
fetch-last-released-docker-image-tag 2m 🟩 
check-dynamic-deps 2m 🟩 
general-lints 57s 🟩 
semgrep/ci 29s 🟩 
file_change_determinator 13s 🟩 
file_change_determinator 11s 🟩 
permission-check 3s 🟩 
determine-docker-build-metadata 3s 🟩 

settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io

@github-actions github-actions bot force-pushed the backport/aptos-release-v1.26/pr-15800 branch from 0bb634c to f4d3026 Compare January 24, 2025 16:42
@github-actions github-actions bot mentioned this pull request Jan 24, 2025
Merged
2 tasks
@msmouse msmouse enabled auto-merge (squash) January 24, 2025 17:38
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link
Contributor Author

✅ Forge suite compat success on 6593fb81261f25490ffddc2252a861c994234c2a ==> f4d3026b4922e7846997badae118e61f7b45af7c

Compatibility test results for 6593fb81261f25490ffddc2252a861c994234c2a ==> f4d3026b4922e7846997badae118e61f7b45af7c (PR)
1. Check liveness of validators at old version: 6593fb81261f25490ffddc2252a861c994234c2a
compatibility::simple-validator-upgrade::liveness-check : committed: 16752.29 txn/s, latency: 2068.61 ms, (p50: 2100 ms, p70: 2200, p90: 2400 ms, p99: 3700 ms), latency samples: 546440
2. Upgrading first Validator to new version: f4d3026b4922e7846997badae118e61f7b45af7c
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 3987.46 txn/s, latency: 7831.71 ms, (p50: 8600 ms, p70: 9300, p90: 9600 ms, p99: 9700 ms), latency samples: 88980
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 3927.58 txn/s, latency: 8700.66 ms, (p50: 9800 ms, p70: 9800, p90: 10000 ms, p99: 10100 ms), latency samples: 139340
3. Upgrading rest of first batch to new version: f4d3026b4922e7846997badae118e61f7b45af7c
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 4004.74 txn/s, latency: 7780.52 ms, (p50: 8500 ms, p70: 9200, p90: 9600 ms, p99: 9700 ms), latency samples: 89200
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 3965.76 txn/s, latency: 8629.25 ms, (p50: 9700 ms, p70: 9700, p90: 10000 ms, p99: 10000 ms), latency samples: 139920
4. upgrading second batch to new version: f4d3026b4922e7846997badae118e61f7b45af7c
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 7036.47 txn/s, latency: 4326.08 ms, (p50: 4600 ms, p70: 5100, p90: 5800 ms, p99: 6100 ms), latency samples: 131860
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 6805.15 txn/s, latency: 4953.27 ms, (p50: 5200 ms, p70: 5800, p90: 6000 ms, p99: 6300 ms), latency samples: 233540
5. check swarm health
Compatibility test for 6593fb81261f25490ffddc2252a861c994234c2a ==> f4d3026b4922e7846997badae118e61f7b45af7c passed
Test Ok

@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link
Contributor Author

✅ Forge suite realistic_env_max_load success on f4d3026b4922e7846997badae118e61f7b45af7c

two traffics test: inner traffic : committed: 13543.55 txn/s, latency: 2929.14 ms, (p50: 2700 ms, p70: 2900, p90: 3600 ms, p99: 10200 ms), latency samples: 5149600
two traffics test : committed: 99.97 txn/s, latency: 2891.08 ms, (p50: 2000 ms, p70: 2500, p90: 5000 ms, p99: 13000 ms), latency samples: 1820
Latency breakdown for phase 0: ["MempoolToBlockCreation: max: 1.160, avg: 0.830", "ConsensusProposalToOrdered: max: 0.307, avg: 0.303", "ConsensusOrderedToCommit: max: 0.549, avg: 0.489", "ConsensusProposalToCommit: max: 0.849, avg: 0.792"]
Max non-epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 0.80s no progress at version 41700 (avg 0.21s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 0.65s no progress at version 2073244 (avg 0.65s) [limit 16].
Test Ok

@msmouse msmouse merged commit cb5d7c9 into aptos-release-v1.26 Jan 24, 2025
42 of 46 checks passed
@msmouse msmouse deleted the backport/aptos-release-v1.26/pr-15800 branch January 24, 2025 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igor-aptos igor-aptos igor-aptos approved these changes

@msmouse msmouse msmouse approved these changes

@lightmark lightmark Awaiting requested review from lightmark lightmark is a code owner

@grao1991 grao1991 Awaiting requested review from grao1991 grao1991 is a code owner

Assignees

@thepomeranian thepomeranian

Labels
cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@msmouse @igor-aptos @thepomeranian