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

Merge master (2.2.2) into develop #5117

Merged
merged 6 commits into from
Sep 6, 2024
Merged

Merge master (2.2.2) into develop #5117

merged 6 commits into from
Sep 6, 2024

Conversation

ximinez
Copy link
Collaborator

@ximinez ximinez commented Sep 3, 2024

This PR must be merged manually using a --ff-only merge. Do not use the Github UI.

High Level Overview of Change

Merge rippled fixes released in 2.2.2 from master branch

This PR intentionally reverts change in BuildInfo.cpp, for obvious reason.

Context of Change

#5115

Also updates [RELEASENOTES.md] for 2.2.1 and 2.2.2

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • Reverse merge

vlntb and others added 6 commits August 26, 2024 19:03
@vlntb @ximinez
Track latencies of certain code blocks, and log if they take too long
00ed7c9
@mtrippled @ximinez
Allow only 1 job queue slot for acquiring inbound ledger.
7741483 
* Log when duplicate concurrent inbound ledger are filtered.
* RAII for containers that track concurrent inbound ledger.
* Comment on when to asynchronously acquire inbound ledgers, which
   is possible to be always OK, but should have further review.
* Other small logging changes

Co-authored-by: Ed Hennis <ed@ripple.com>
@mtrippled @ximinez
Allow only 1 job queue slot for each validation ledger check
fbbea9e 
* refactor filtering of validations to specifically avoid
 concurrent checkAccept() calls for the same validation ledger hash.
* Log when duplicate concurrent validation requests are filtered.
* RAII for containers that track concurrent validation requests.
@ximinez
Set version to 2.2.2
85214bd
@ximinez
Merge remote-tracking branch 'upstream/master' into upstream--develop
37b3e96 
* upstream/master:
  Set version to 2.2.2
  Allow only 1 job queue slot for each validation ledger check
  Allow only 1 job queue slot for acquiring inbound ledger.
  Track latencies of certain code blocks, and log if they take too long
@ximinez
Update Release Notes for 2.2.1 and 2.2.2
cc0177b
@Bronek Bronek self-requested a review September 4, 2024 10:22
@codecov Codecov
Copy link

codecov bot commented Sep 4, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 57.62712% with 50 lines in your changes missing coverage. Please review.

Project coverage is 76.1%. Comparing base (2f432e8) to head (cc0177b).
Report is 6 commits behind head on develop.

Files with missing lines Patch % Lines
src/xrpld/app/misc/NetworkOPs.cpp 0.0% 21 Missing ⚠️
src/xrpld/app/ledger/detail/InboundLedgers.cpp 77.1% 11 Missing ⚠️
src/xrpld/app/consensus/RCLConsensus.cpp 0.0% 4 Missing ⚠️
src/xrpld/app/consensus/RCLValidations.cpp 66.7% 4 Missing ⚠️
src/xrpld/overlay/detail/PeerImp.cpp 0.0% 4 Missing ⚠️
src/xrpld/app/rdb/detail/Vacuum.cpp 0.0% 2 Missing ⚠️
src/xrpld/core/Config.h 0.0% 2 Missing ⚠️
src/xrpld/perflog/PerfLog.h 80.0% 2 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           develop   #5117     +/-   ##
=========================================
- Coverage     76.2%   76.1%   -0.1%     
=========================================
  Files          760     760             
  Lines        61489   61556     +67     
  Branches      8115    8167     +52     
=========================================
+ Hits         46832   46835      +3     
- Misses       14657   14721     +64
Files with missing lines Coverage Δ
src/xrpld/app/consensus/RCLValidations.h 77.8% <ø> (ø)
src/xrpld/app/ledger/InboundLedgers.h 100.0% <ø> (ø)
src/xrpld/app/ledger/detail/InboundLedger.cpp 32.7% <100.0%> (-2.5%) ⬇️
src/xrpld/app/main/Application.cpp 67.8% <100.0%> (-0.1%) ⬇️
src/xrpld/app/main/Main.cpp 79.1% <ø> (ø)
src/xrpld/app/rdb/backend/detail/Node.cpp 58.4% <100.0%> (ø)
...rc/xrpld/app/rdb/backend/detail/SQLiteDatabase.cpp 58.6% <100.0%> (ø)
src/xrpld/app/rdb/detail/Wallet.cpp 78.6% <100.0%> (ø)
src/xrpld/core/DatabaseCon.h 100.0% <100.0%> (ø)
src/xrpld/app/rdb/detail/Vacuum.cpp 0.0% <0.0%> (ø)
... and 7 more

... and 4 files with indirect coverage changes

Impacted file tree graph

Bronek
Bronek approved these changes Sep 5, 2024
View reviewed changes
Copy link
Collaborator

@Bronek Bronek left a comment

Choose a reason for hiding this comment

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

I verified that this patch is equivalent with the 2.2.2 release, bar changes which do not apply to develop because of the removal of the shard support and the reporting mode.

@ximinez ximinez added the Passed Passed code review & PR owner thinks it's ready to merge. Perf sign-off may still be required. label Sep 6, 2024
@ximinez ximinez merged commit cc0177b into XRPLF:develop Sep 6, 2024
19 of 20 checks passed
@ximinez ximinez deleted the pr/merge222 branch September 6, 2024 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thejohnfreeman thejohnfreeman thejohnfreeman approved these changes

@Bronek Bronek Bronek approved these changes

Assignees
No one assigned
Labels
Passed Passed code review & PR owner thinks it's ready to merge. Perf sign-off may still be required.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ximinez @Bronek @thejohnfreeman @vlntb @mtrippled