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

[qs] remove assertion on timestamp #15306

Merged
merged 1 commit into from
Nov 19, 2024
Merged

[qs] remove assertion on timestamp #15306

merged 1 commit into from
Nov 19, 2024

Conversation

zekun000
Copy link
Contributor

Description

How Has This Been Tested?

Key Areas to Review

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
  • Move Compiler
  • Other (specify)

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

@trunk-io Trunk.io
Copy link

trunk-io bot commented Nov 18, 2024 •
edited
Loading

⏱️ 2h 3m total CI duration on this PR
Slowest 15 Jobs Cumulative Duration Recent Runs
execution-performance / test-target-determinator 13m 🟩 🟩 🟩 
test-target-determinator 13m 🟩 🟩 🟩 
rust-move-tests 13m 🟩 
rust-move-tests 13m 🟩 
rust-move-tests 12m 🟩 
rust-move-tests 12m 🟩 
check 11m 🟩 🟩 🟩 
rust-cargo-deny 7m 🟩 🟩 🟩 🟩 
rust-doc-tests 5m 🟩 
rust-doc-tests 5m 🟩 
rust-doc-tests 5m 🟩 
fetch-last-released-docker-image-tag 5m 🟩 🟩 🟩 
check-dynamic-deps 5m 🟩 🟩 🟩 🟩 
general-lints 2m 🟩 🟩 🟩 🟩 
semgrep/ci 2m 🟩 🟩 🟩 🟩 

🚨 1 job on the last run was significantly faster/slower than expected

Job Duration vs 7d avg Delta
execution-performance / single-node-performance 9s 17m -99%

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

bchocho
bchocho reviewed Nov 18, 2024
View reviewed changes
consensus/src/quorum_store/batch_proof_queue.rs
assert!(
self.latest_block_timestamp <= block_timestamp,
"Decreasing block timestamp"
);
self.latest_block_timestamp = block_timestamp;
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we only update when self.latest_block_timestamp <= block_timestamp?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the early return above does it?

@zekun000 zekun000 enabled auto-merge (rebase) November 19, 2024 21: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

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

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@zekun000 zekun000 merged commit 11c4819 into main Nov 19, 2024
94 checks passed
@zekun000 zekun000 deleted the zekun/fix branch November 19, 2024 22:09
@github-actions github-actions bot mentioned this pull request Nov 20, 2024
Merged
@github-actions GitHub Actions
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

@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

This comment has been minimized.

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

✅ Forge suite realistic_env_max_load success on 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e

two traffics test: inner traffic : committed: 14374.83 txn/s, latency: 2766.59 ms, (p50: 2700 ms, p70: 2700, p90: 3000 ms, p99: 3600 ms), latency samples: 5465820
two traffics test : committed: 99.91 txn/s, latency: 1717.98 ms, (p50: 1400 ms, p70: 1500, p90: 1600 ms, p99: 10500 ms), latency samples: 1820
Latency breakdown for phase 0: ["MempoolToBlockCreation: max: 2.001, avg: 1.551", "ConsensusProposalToOrdered: max: 0.320, avg: 0.293", "ConsensusOrderedToCommit: max: 0.383, avg: 0.374", "ConsensusProposalToCommit: max: 0.676, avg: 0.668"]
Max non-epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 1.08s no progress at version 2463503 (avg 0.20s) [limit 15].
Max epoch-change gap was: 0 rounds at version 0 (avg 0.00) [limit 4], 8.60s no progress at version 2463501 (avg 8.60s) [limit 15].
Test Ok

@github-actions GitHub Actions
Copy link
Contributor

✅ Forge suite framework_upgrade success on 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e

Compatibility test results for 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e (PR)
Upgrade the nodes to version: 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1335.78 txn/s, submitted: 1338.30 txn/s, failed submission: 2.51 txn/s, expired: 2.51 txn/s, latency: 2259.39 ms, (p50: 1800 ms, p70: 2300, p90: 4400 ms, p99: 5700 ms), latency samples: 116960
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1434.66 txn/s, submitted: 1438.52 txn/s, failed submission: 3.86 txn/s, expired: 3.86 txn/s, latency: 2237.50 ms, (p50: 1800 ms, p70: 2300, p90: 4000 ms, p99: 5300 ms), latency samples: 126320
5. check swarm health
Compatibility test for 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e passed
Upgrade the remaining nodes to version: 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e
framework_upgrade::framework-upgrade::full-framework-upgrade : committed: 1308.28 txn/s, submitted: 1312.02 txn/s, failed submission: 3.75 txn/s, expired: 3.75 txn/s, latency: 2269.98 ms, (p50: 2100 ms, p70: 2400, p90: 3600 ms, p99: 5100 ms), latency samples: 118700
Test Ok

@github-actions GitHub Actions
Copy link
Contributor

✅ Forge suite compat success on 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e

Compatibility test results for 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e (PR)
1. Check liveness of validators at old version: 7f9825b598e86c97526ffe2c796ee17b565f933a
compatibility::simple-validator-upgrade::liveness-check : committed: 14286.59 txn/s, latency: 2360.78 ms, (p50: 1900 ms, p70: 2100, p90: 3300 ms, p99: 9600 ms), latency samples: 464760
2. Upgrading first Validator to new version: 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e
compatibility::simple-validator-upgrade::single-validator-upgrading : committed: 6819.57 txn/s, latency: 4158.93 ms, (p50: 4800 ms, p70: 5000, p90: 5300 ms, p99: 5800 ms), latency samples: 119960
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 6821.04 txn/s, latency: 4738.13 ms, (p50: 5000 ms, p70: 5100, p90: 6700 ms, p99: 7100 ms), latency samples: 224200
3. Upgrading rest of first batch to new version: 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e
compatibility::simple-validator-upgrade::half-validator-upgrading : committed: 7484.98 txn/s, latency: 3778.24 ms, (p50: 4200 ms, p70: 4500, p90: 4600 ms, p99: 4700 ms), latency samples: 138260
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 7490.42 txn/s, latency: 4254.49 ms, (p50: 4600 ms, p70: 4700, p90: 5700 ms, p99: 6500 ms), latency samples: 250300
4. upgrading second batch to new version: 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e
compatibility::simple-validator-upgrade::rest-validator-upgrading : committed: 11321.32 txn/s, latency: 2439.78 ms, (p50: 2500 ms, p70: 2700, p90: 3300 ms, p99: 3500 ms), latency samples: 198220
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 11069.05 txn/s, latency: 2840.01 ms, (p50: 2600 ms, p70: 3300, p90: 3600 ms, p99: 4100 ms), latency samples: 363000
5. check swarm health
Compatibility test for 7f9825b598e86c97526ffe2c796ee17b565f933a ==> 7e82d94e9014df91c5fbdb54bf6c71a2b87be76e passed
Test Ok

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bchocho bchocho bchocho left review comments

@ibalajiarun ibalajiarun ibalajiarun approved these changes

@msmouse msmouse msmouse approved these changes

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

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

Assignees
No one assigned
Labels
v1.24
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zekun000 @bchocho @msmouse @ibalajiarun