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

Simplify proof queue data structure [Cherrypicked from (#13866)] #13878

Merged
merged 1 commit into from
Jul 1, 2024

Conversation

vusirikala
Copy link
Contributor

@vusirikala vusirikala commented Jul 1, 2024

Description

Cherrypicking the commit from main branch to simplify the proof queue data structure.

Type of Change

  • New feature
  • Bug fix
  • Breaking change
  • Performance improvement
  • Refactoring
  • Dependency update
  • Documentation update
  • Tests

Which Components or Systems Does This Change Impact?

  • Validator Node
  • Full Node (API, Indexer, etc.)
  • Move/Aptos Virtual Machine
  • Aptos Framework
  • Aptos CLI/SDK
  • Developer Infrastructure
  • Other (specify)

How Has This Been Tested?

Key Areas to Review

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 Jul 1, 2024

@vusirikala vusirikala requested review from sitalkedia, perryjrandall, sherry-x and JoshLind and removed request for sasha8 and gelash July 1, 2024 18:41
@vusirikala vusirikala enabled auto-merge (squash) July 1, 2024 18:49
@vusirikala vusirikala requested a review from rustielin July 1, 2024 18:50

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link
Contributor

github-actions bot commented Jul 1, 2024

✅ Forge suite realistic_env_max_load success on cdc7a56cc6aff9f3773e58e398d2cdc793402fd6

two traffics test: inner traffic : committed: 8556.008495586739 txn/s, latency: 4581.315225841729 ms, (p50: 4500 ms, p90: 5700 ms, p99: 10200 ms), latency samples: 3694180
two traffics test : committed: 99.95427022503603 txn/s, latency: 1958.7233333333334 ms, (p50: 1900 ms, p90: 2200 ms, p99: 3700 ms), latency samples: 1800
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.212, avg: 0.208", "QsPosToProposal: max: 0.188, avg: 0.176", "ConsensusProposalToOrdered: max: 0.307, avg: 0.285", "ConsensusOrderedToCommit: max: 0.367, avg: 0.352", "ConsensusProposalToCommit: max: 0.651, avg: 0.637"]
Max round gap was 1 [limit 4] at version 1774946. Max no progress secs was 4.942217 [limit 15] at version 1774946.
Test Ok

Copy link
Contributor

github-actions bot commented Jul 1, 2024

✅ Forge suite framework_upgrade success on f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6

Compatibility test results for f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6 (PR)
Upgrade the nodes to version: cdc7a56cc6aff9f3773e58e398d2cdc793402fd6
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1203.3566220629518 txn/s, submitted: 1205.6037866232934 txn/s, failed submission: 2.247164560341647 txn/s, expired: 2.247164560341647 txn/s, latency: 2535.6929971988798 ms, (p50: 1800 ms, p90: 4500 ms, p99: 10100 ms), latency samples: 107100
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1193.5088166465287 txn/s, submitted: 1195.265452835874 txn/s, failed submission: 1.7566361893451852 txn/s, expired: 1.7566361893451852 txn/s, latency: 2785.6113751051303 ms, (p50: 2100 ms, p90: 5400 ms, p99: 8500 ms), latency samples: 95120
5. check swarm health
Compatibility test for f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6 passed
Upgrade the remaining nodes to version: cdc7a56cc6aff9f3773e58e398d2cdc793402fd6
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1083.9174147931399 txn/s, submitted: 1086.180290398136 txn/s, failed submission: 2.262875604996117 txn/s, expired: 2.262875604996117 txn/s, latency: 2782.7253862212942 ms, (p50: 2100 ms, p90: 4800 ms, p99: 8600 ms), latency samples: 95800
Test Ok

Copy link
Contributor

github-actions bot commented Jul 1, 2024

✅ Forge suite compat success on f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6

Compatibility test results for f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6 (PR)
1. Check liveness of validators at old version: f648076a280621dbfd4e73b1ca83e3a3f52878ed
compatibility::simple-validator-upgrade::liveness-check : committed: 7745.397425972529 txn/s, latency: 3716.394828350646 ms, (p50: 3000 ms, p90: 3800 ms, p99: 24400 ms), latency samples: 315760
2. Upgrading first Validator to new version: cdc7a56cc6aff9f3773e58e398d2cdc793402fd6
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 1054.867176458151 txn/s, latency: 24763.261072544254 ms, (p50: 28400 ms, p90: 43100 ms, p99: 47200 ms), latency samples: 57620
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 1494.6048536568453 txn/s, latency: 19825.141739846324 ms, (p50: 20500 ms, p90: 30600 ms, p99: 32600 ms), latency samples: 72880
3. Upgrading rest of first batch to new version: cdc7a56cc6aff9f3773e58e398d2cdc793402fd6
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 3425.266246012587 txn/s, latency: 7103.0282979194335 ms, (p50: 8400 ms, p90: 9700 ms, p99: 11100 ms), latency samples: 90360
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 3302.5402721190267 txn/s, latency: 9430.64101355333 ms, (p50: 9600 ms, p90: 14800 ms, p99: 15100 ms), latency samples: 135760
4. upgrading second batch to new version: cdc7a56cc6aff9f3773e58e398d2cdc793402fd6
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 6503.150750860648 txn/s, latency: 4306.939751978089 ms, (p50: 4800 ms, p90: 5300 ms, p99: 5700 ms), latency samples: 131440
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 6497.896750902175 txn/s, latency: 5067.346469288555 ms, (p50: 5100 ms, p90: 6800 ms, p99: 7900 ms), latency samples: 226300
5. check swarm health
Compatibility test for f648076a280621dbfd4e73b1ca83e3a3f52878ed ==> cdc7a56cc6aff9f3773e58e398d2cdc793402fd6 passed
Test Ok

Copy link
Contributor

@bchocho bchocho left a comment

Choose a reason for hiding this comment

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

can you add …(#13866) to the end of the title for this cherry-pick PR?

@vusirikala vusirikala merged commit daea1c7 into aptos-release-v1.16 Jul 1, 2024
85 of 88 checks passed
@vusirikala vusirikala deleted the satya/count_proof_queue_cherrypick branch July 1, 2024 20:38
@vusirikala vusirikala changed the title Simplify proof queue data structure Simplify proof queue data structure [Cherrypicked from (#13866)] Jul 1, 2024
vusirikala added a commit that referenced this pull request Jul 2, 2024
vusirikala added a commit that referenced this pull request Jul 2, 2024
* Revert "Change proof queue data structure (#13878)"

This reverts commit daea1c7.

* Revert "Proof queue with more accurate calculation of remaining txns in the pipeline (#13703)"

This reverts commit 387c649.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants