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.

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

[loader-v2] Addressing simple loader V2 TODOs #15316

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

georgemitenkov
Copy link
Contributor

@georgemitenkov georgemitenkov commented Nov 19, 2024

Description

Addressing loader's TODOs:

  • Switching from undefined to script location
  • Keeping error remapping because the status code exists on-chain. It is probably fine t keep it as is.
  • Removed useless TODO for alerts on concurrent manager uses.
  • Changed errors.rs TODO into a note, as it is not a P0/P1/P2 to fix.

How Has This Been Tested?

Existing tests

Key Areas to Review

Type of Change

  • Refactoring
  • Tests

Which Components or Systems Does This Change Impact?

  • Move/Aptos Virtual Machine

Checklist

  • I have read and followed the CONTRIBUTING doc
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I identified and added all stakeholders and component owners affected by this change as reviewers
  • I tested both happy and unhappy path of the functionality
  • I have made corresponding changes to the documentation

Copy link

trunk-io bot commented Nov 19, 2024

⏱️ 9h 21m total CI duration on this PR
Slowest 15 Jobs Cumulative Duration Recent Runs
execution-performance / single-node-performance 3h 34m 🟩🟩🟩🟩🟥 (+7 more)
execution-performance / test-target-determinator 54m 🟩🟩🟩🟩🟩 (+7 more)
test-target-determinator 47m 🟩🟩🟩🟩 (+7 more)
check 40m 🟩🟩🟩🟩 (+7 more)
rust-cargo-deny 20m 🟩🟩🟩 (+8 more)
fetch-last-released-docker-image-tag 18m 🟩🟩🟩🟩 (+7 more)
check-dynamic-deps 16m 🟩🟩🟩🟩🟩 (+8 more)
rust-move-tests 13m 🟩
rust-move-tests 13m 🟩
rust-move-tests 12m 🟩
rust-move-tests 12m 🟩
rust-move-tests 7m
rust-move-tests 7m
rust-move-tests 6m
rust-move-tests 6m

settingsfeedbackdocs ⋅ learn more about trunk.io

@georgemitenkov georgemitenkov added the CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR label Nov 19, 2024
Copy link
Contributor Author

georgemitenkov commented Nov 19, 2024

@georgemitenkov georgemitenkov force-pushed the george/loader-v2-todos-script-location branch 3 times, most recently from ceb67d1 to 8187def Compare November 19, 2024 16:46
@georgemitenkov georgemitenkov changed the title [loader-v2] Use script location instead of undefined [loader-v2] Addressing simple loader V2 TODOs Nov 19, 2024
@georgemitenkov georgemitenkov force-pushed the george/loader-v2-todos-script-location branch 3 times, most recently from 3aaa739 to 89bf6f8 Compare November 19, 2024 17:02

This comment has been minimized.

This comment has been minimized.

@georgemitenkov georgemitenkov marked this pull request as ready for review November 19, 2024 17:29
@georgemitenkov georgemitenkov requested review from runtian-zhou, vgao1996, igor-aptos and ziaptos and removed request for sasha8 and danielxiangzl November 19, 2024 17:29

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

@igor-aptos igor-aptos left a comment

Choose a reason for hiding this comment

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

looks good!

these are backward incompatible changes, so let's cherry-pick this PR to 1.24, before it goes to testnet, to keep optionality to enable module loader on 1.24

@georgemitenkov georgemitenkov force-pushed the george/loader-v2-todos-script-location branch from 89bf6f8 to 3b035a7 Compare November 19, 2024 19:49
@georgemitenkov georgemitenkov changed the base branch from george/loader-v2-todos-remove-some-v1-tests to george/loader-v2-todos November 19, 2024 19:49
@georgemitenkov georgemitenkov requested a review from wrwg as a code owner November 20, 2024 18:06
@georgemitenkov georgemitenkov force-pushed the george/loader-v2-todos-script-location branch from 3b035a7 to 429acfd Compare November 20, 2024 18:06

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Base automatically changed from george/loader-v2-todos to main November 20, 2024 20:34
@georgemitenkov georgemitenkov force-pushed the george/loader-v2-todos-script-location branch from 429acfd to a351639 Compare November 20, 2024 21:16
@georgemitenkov georgemitenkov enabled auto-merge (squash) November 20, 2024 21:17

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

@georgemitenkov georgemitenkov merged commit dbdb613 into main Nov 20, 2024
71 of 89 checks passed
@georgemitenkov georgemitenkov deleted the george/loader-v2-todos-script-location branch November 20, 2024 21:51
github-actions bot pushed a commit that referenced this pull request Nov 20, 2024
- Switching from undefined to script location
- Keeping error remapping because the status code exists on-chain.
   It is probably fine t keep it as is.
- Removed useless TODO for alerts on concurrent manager uses.
- Changed errors.rs TODO into a note, as it is not a P0/P1/P2 to fix.

(cherry picked from commit dbdb613)
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
aptos-release-v1.24

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

✅ Forge suite realistic_env_max_load success on a3516391e2c2960ccd2b75f9756952a169c2de3d

two traffics test: inner traffic : committed: 14396.50 txn/s, latency: 2762.29 ms, (p50: 2700 ms, p70: 2700, p90: 3000 ms, p99: 3200 ms), latency samples: 5473880
two traffics test : committed: 99.96 txn/s, latency: 1578.12 ms, (p50: 1400 ms, p70: 1400, p90: 1500 ms, p99: 10800 ms), latency samples: 1740
Latency breakdown for phase 0: ["MempoolToBlockCreation: max: 1.983, avg: 1.451", "ConsensusProposalToOrdered: max: 0.329, avg: 0.296", "ConsensusOrderedToCommit: max: 0.396, avg: 0.378", "ConsensusProposalToCommit: max: 0.689, avg: 0.674"]
Max non-epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 0.91s no progress at version 2182946 (avg 0.20s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 8.59s no progress at version 2182944 (avg 8.59s) [limit 15].
Test Ok

Copy link
Contributor

✅ Forge suite compat success on df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d

Compatibility test results for df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d (PR)
1. Check liveness of validators at old version: df3d8058768fe607ead6d0e9f60e954977d7b0d4
compatibility::simple-validator-upgrade::liveness-check : committed: 14677.18 txn/s, latency: 2160.28 ms, (p50: 2100 ms, p70: 2100, p90: 2200 ms, p99: 7500 ms), latency samples: 551800
2. Upgrading first Validator to new version: a3516391e2c2960ccd2b75f9756952a169c2de3d
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 6867.03 txn/s, latency: 4127.37 ms, (p50: 4700 ms, p70: 5000, p90: 5100 ms, p99: 5200 ms), latency samples: 127340
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 6264.05 txn/s, latency: 5006.80 ms, (p50: 5100 ms, p70: 5100, p90: 7000 ms, p99: 7500 ms), latency samples: 232080
3. Upgrading rest of first batch to new version: a3516391e2c2960ccd2b75f9756952a169c2de3d
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 6695.81 txn/s, latency: 4087.98 ms, (p50: 4500 ms, p70: 4900, p90: 5600 ms, p99: 5900 ms), latency samples: 123680
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 6425.82 txn/s, latency: 4979.91 ms, (p50: 5300 ms, p70: 5500, p90: 6500 ms, p99: 7000 ms), latency samples: 218160
4. upgrading second batch to new version: a3516391e2c2960ccd2b75f9756952a169c2de3d
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 12252.01 txn/s, latency: 2242.84 ms, (p50: 2500 ms, p70: 2600, p90: 2700 ms, p99: 2800 ms), latency samples: 211480
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 12186.67 txn/s, latency: 2634.62 ms, (p50: 2700 ms, p70: 2700, p90: 2800 ms, p99: 3500 ms), latency samples: 391520
5. check swarm health
Compatibility test for df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d passed
Test Ok

Copy link
Contributor

✅ Forge suite framework_upgrade success on df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d

Compatibility test results for df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d (PR)
Upgrade the nodes to version: a3516391e2c2960ccd2b75f9756952a169c2de3d
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1321.10 txn/s, submitted: 1324.72 txn/s, failed submission: 3.62 txn/s, expired: 3.62 txn/s, latency: 2295.84 ms, (p50: 2100 ms, p70: 2400, p90: 3900 ms, p99: 4800 ms), latency samples: 116780
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1289.91 txn/s, submitted: 1292.35 txn/s, failed submission: 2.44 txn/s, expired: 2.44 txn/s, latency: 2346.34 ms, (p50: 1800 ms, p70: 2400, p90: 4500 ms, p99: 5600 ms), latency samples: 116300
5. check swarm health
Compatibility test for df3d8058768fe607ead6d0e9f60e954977d7b0d4 ==> a3516391e2c2960ccd2b75f9756952a169c2de3d passed
Upgrade the remaining nodes to version: a3516391e2c2960ccd2b75f9756952a169c2de3d
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1310.38 txn/s, submitted: 1313.25 txn/s, failed submission: 2.87 txn/s, expired: 2.87 txn/s, latency: 2251.27 ms, (p50: 2100 ms, p70: 2400, p90: 3300 ms, p99: 4800 ms), latency samples: 118780
Test Ok

georgemitenkov added a commit that referenced this pull request Nov 21, 2024
- Switching from undefined to script location
- Keeping error remapping because the status code exists on-chain.
   It is probably fine t keep it as is.
- Removed useless TODO for alerts on concurrent manager uses.
- Changed errors.rs TODO into a note, as it is not a P0/P1/P2 to fix.

(cherry picked from commit dbdb613)

Co-authored-by: George Mitenkov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CICD:run-e2e-tests when this label is present github actions will run all land-blocking e2e tests from the PR v1.24
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants