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

Use bollard crate directly, upgrade serde to 1.0.152 #10546

Merged
merged 1 commit into from Oct 17, 2023
Merged

Use bollard crate directly, upgrade serde to 1.0.152 #10546

merged 1 commit into from Oct 17, 2023

Conversation

banool
Copy link
Contributor

@banool banool commented Oct 17, 2023 •
edited

Description

This PR changes us from using my Bollard fork that uses an older serde_with version to using the main Bollard crate.

Recently I landed a PR to serde_with that changed the minimum required serde version from 1.0.157 to 1.0.152: jonasbb/serde_with#653. Bollard uses serde_with, so now the transitive dependency on serde through serde_with from Bollard is no longer 1.0.157 but 1.0.152, which we can use happily without breaking the the analyze formats code (see this issue for more details: #10424).

Test Plan

cargo run -p generate-format -- --corpus aptos

@banool
Use bollard crate directly
6e4f5ab 
This PR changes us from using my Bollard fork that uses an older
serde_with version to using the main Bollard crate.

Recently I landed a PR to serde_with that changed the minimum required
serde version from 1.0.157 to 1.0.152. Bollard uses serde_with, so now
the transitive dependency on serde through serde_with from Bollard is no
longer 1.0.157 but 1.0.152, which we can use happily without breaking
the the analyze formats code (see this issue for more details: ).
@banool banool marked this pull request as ready for review October 17, 2023 18:13
@banool banool changed the title Use bollard crate directly Use bollard crate directly, upgrade serde to 1.0.152 Oct 17, 2023
@banool banool enabled auto-merge (squash) October 17, 2023 18:25
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions
Copy link
Contributor

✅ Forge suite compat success on aptos-node-v1.6.2 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072

Compatibility test results for aptos-node-v1.6.2 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072 (PR)
1. Check liveness of validators at old version: aptos-node-v1.6.2
compatibility::simple-validator-upgrade::liveness-check : committed: 3017 txn/s, latency: 7230 ms, (p50: 7800 ms, p90: 9600 ms, p99: 11100 ms), latency samples: 165980
2. Upgrading first Validator to new version: 6e4f5abf619fe178bd0538bb4ab57e55ceb35072
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 1827 txn/s, latency: 15914 ms, (p50: 18700 ms, p90: 22300 ms, p99: 22500 ms), latency samples: 93200
3. Upgrading rest of first batch to new version: 6e4f5abf619fe178bd0538bb4ab57e55ceb35072
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 1324 txn/s, latency: 16446 ms, (p50: 19000 ms, p90: 22000 ms, p99: 25600 ms), latency samples: 92700
4. upgrading second batch to new version: 6e4f5abf619fe178bd0538bb4ab57e55ceb35072
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 3454 txn/s, latency: 9074 ms, (p50: 9700 ms, p90: 12400 ms, p99: 12900 ms), latency samples: 145100
5. check swarm health
Compatibility test for aptos-node-v1.6.2 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072 passed
Test Ok

@github-actions
Copy link
Contributor

✅ Forge suite realistic_env_max_load success on 6e4f5abf619fe178bd0538bb4ab57e55ceb35072

two traffics test: inner traffic : committed: 7818 txn/s, latency: 5015 ms, (p50: 4600 ms, p90: 5700 ms, p99: 22900 ms), latency samples: 3377440
two traffics test : committed: 100 txn/s, latency: 2578 ms, (p50: 2200 ms, p90: 2700 ms, p99: 12300 ms), latency samples: 1860
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.213, avg: 0.199", "QsPosToProposal: max: 0.435, avg: 0.186", "ConsensusProposalToOrdered: max: 0.622, avg: 0.588", "ConsensusOrderedToCommit: max: 0.594, avg: 0.552", "ConsensusProposalToCommit: max: 1.208, avg: 1.140"]
Max round gap was 1 [limit 4] at version 1703872. Max no progress secs was 4.525475 [limit 10] at version 1703872.
Test Ok

@github-actions
Copy link
Contributor

✅ Forge suite framework_upgrade success on aptos-node-v1.5.1 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072

Compatibility test results for aptos-node-v1.5.1 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072 (PR)
Upgrade the nodes to version: 6e4f5abf619fe178bd0538bb4ab57e55ceb35072
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 4145 txn/s, latency: 4969 ms, (p50: 4800 ms, p90: 8100 ms, p99: 8700 ms), latency samples: 236320
5. check swarm health
Compatibility test for aptos-node-v1.5.1 ==> 6e4f5abf619fe178bd0538bb4ab57e55ceb35072 passed
Test Ok

@banool banool merged commit ecfa5f8 into main Oct 17, 2023
96 of 97 checks passed
@banool banool deleted the banool/bollard-crate branch October 17, 2023 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bowenyang007 bowenyang007 bowenyang007 approved these changes

@larry-aptos larry-aptos larry-aptos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@banool @bowenyang007 @larry-aptos