stabilize congestion control and stateless validation #11701
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tayfunelmas
reviewed
Jul 2, 2024
tayfunelmas
reviewed
Jul 2, 2024
bowenwang1996
approved these changes
Jul 2, 2024
wacban
commented
Jul 2, 2024
Comment on lines
+767
to
+769
| // TODO - Since the stabilization of Stateless Validation which includes the | ||
| // SingleShardTracking this test doesn't make sense anymore. We should remove it. | ||
| if !ProtocolFeature::SingleShardTracking.enabled(PROTOCOL_VERSION) { |
There was a problem hiding this comment.
@jancionear You touched this last, can you confirm this is the right thing to do please?
There was a problem hiding this comment.
I only know what the comment says:
// Note: For nightly, which includes SingleShardTracking, this check is disabled because
// we're so efficient with part forwarding now that we don't seem to be forwarding more
// than it is necessary.
I don't know if it should be removed, maybe just modified?
I disabled it for stateless validation based on the fact that it was disabled with SingleShardTracking
| #[test] | ||
| #[ignore] |
There was a problem hiding this comment.
I commented on #8590 mentioning that I'm disabling this test. It can be fixed in due time.
jakmeier
approved these changes
Jul 2, 2024
| // TODO(congestion_control): remove cfg on stabilization | ||
| #[cfg(feature = "nightly")] | ||
| let final_balance = final_balance.saturating_add(self.new_buffered_receipts_balance); | ||
| .saturating_add(self.other_burnt_amount) |
There was a problem hiding this comment.
Right, we need to remove the CFG here. But I just realized, did we run this on statlessnet without nightly? That would mean we didn't test the balance checker changes as much as I hoped we would :S
There was a problem hiding this comment.
yeah, statelessnet only had the statelessnet_protocol feature enabled
There was a problem hiding this comment.
I think we want to add this PR to statelessnet so it will get some coverage still
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #11701 +/- ##
==========================================
- Coverage 71.77% 70.23% -1.55%
==========================================
Files 790 790
Lines 161879 161942 +63
Branches 161879 161942 +63
==========================================
- Hits 116196 113734 -2462
- Misses 40649 43244 +2595
+ Partials 5034 4964 -70
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
wacban
added a commit
that referenced
this pull request
Jul 3, 2024
# Feature to stabilize This PR stabilizes the Congestion Control and Stateless Validation protocol features. They are assigned separate protocol features and the protocol upgrades should be scheduled separately. # Context * near/NEPs#539 * near/NEPs#509 # Testing and QA Those features are well covered in unit, integration and end to end tests and were extensively tested in forknet and statelessnet. # Checklist - [x] Link to nightly nayduck run (`./scripts/nayduck.py`, [docs](https://github.com/near/nearcore/blob/master/nightly/README.md#scheduling-a-run)): https://nayduck.nearone.org/ - [x] Update CHANGELOG.md to include this protocol feature in the `Unreleased` section.
marcelo-gonzalez
pushed a commit
to marcelo-gonzalez/nearcore
that referenced
this pull request
Jul 3, 2024
# Feature to stabilize This PR stabilizes the Congestion Control and Stateless Validation protocol features. They are assigned separate protocol features and the protocol upgrades should be scheduled separately. # Context * near/NEPs#539 * near/NEPs#509 # Testing and QA Those features are well covered in unit, integration and end to end tests and were extensively tested in forknet and statelessnet. # Checklist - [x] Link to nightly nayduck run (`./scripts/nayduck.py`, [docs](https://github.com/near/nearcore/blob/master/nightly/README.md#scheduling-a-run)): https://nayduck.nearone.org/ - [x] Update CHANGELOG.md to include this protocol feature in the `Unreleased` section.
This was referenced Jul 4, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 5, 2024
#11727) This is a mitigation for the failure that is caused by the stabilization PR #11701. [Zulip thread](https://near.zulipchat.com/#narrow/stream/308695-nearone.2Fprivate/topic/Cherrypicks.20to.20statelessnet.20branch/near/449016937) Context: In statelessnet, the genesis version is above 68, so it assumes that genesis has the congestion control is enabled and hitting an issue that attempts to bootstrap congestion info (again) and hitting missing state roots. We attempted to move the version numbers for congestion control and stateless validation back to 80 and 81 to mitigate the problem, [in this PR](#11719) but it became unnecessarily complex and risky. Thus, in this PR, we simply bypass the problematic bootstrap for statelessnet only. We moved the check for the chain id after the genesis protocol version check so we will not run it for testnet and mainnet.
tayfunelmas
added a commit
that referenced
this pull request
Jul 5, 2024
#11727) This is a mitigation for the failure that is caused by the stabilization PR #11701. [Zulip thread](https://near.zulipchat.com/#narrow/stream/308695-nearone.2Fprivate/topic/Cherrypicks.20to.20statelessnet.20branch/near/449016937) Context: In statelessnet, the genesis version is above 68, so it assumes that genesis has the congestion control is enabled and hitting an issue that attempts to bootstrap congestion info (again) and hitting missing state roots. We attempted to move the version numbers for congestion control and stateless validation back to 80 and 81 to mitigate the problem, [in this PR](#11719) but it became unnecessarily complex and risky. Thus, in this PR, we simply bypass the problematic bootstrap for statelessnet only. We moved the check for the chain id after the genesis protocol version check so we will not run it for testnet and mainnet.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feature to stabilize
This PR stabilizes the Congestion Control and Stateless Validation protocol features. They are assigned separate protocol features and the protocol upgrades should be scheduled separately.
Context
Testing and QA
Those features are well covered in unit, integration and end to end tests and were extensively tested in forknet and statelessnet.
Checklist
./scripts/nayduck.py, docs): https://nayduck.nearone.org/Unreleasedsection.