Review fixes and refactor: #6
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
1) refactor filtering of validations to specifically avoid concurrent checkAccept() calls for the same validation hash. 2) Log when duplicate concurrent inbound ledger and validation requests are filtered. 3) RAII for containers that track concurrent inbound ledger and validation requests. 4) Comment on when to asynchronously acquire inbound ledgers, which is possible to be always OK, but should have further review.
mtrippled
force-pushed
the
refactor-validation
branch
from
f15ac51 to
7503b41
Compare
ximinez
requested changes
Aug 29, 2024
| #include <vector> | ||
|
|
||
| namespace ripple { | ||
|
|
||
| class Application; | ||
|
|
||
| enum class BypassAccept { FALSE, TRUE }; |
There was a problem hiding this comment.
The FALSE and TRUE keywords are #defined on Windows, which messes up building this.
Suggested change
| enum class BypassAccept { FALSE, TRUE }; | |
| enum class BypassAccept : bool { no = false, yes }; |
There was a problem hiding this comment.
I pushed this change to the branch so I can go ahead and merge this pull request. and let testing proceed.
Comment on lines
159
to
181
| std::unique_lock lock(acquiresMutex_); | ||
| if (pendingAcquires_.contains(hash)) | ||
| return; | ||
| pendingAcquires_.insert(hash); | ||
| lock.unlock(); | ||
| acquire(hash, seq, reason); | ||
| try | ||
| { | ||
| if (pendingAcquires_.contains(hash)) | ||
| return; | ||
| pendingAcquires_.insert(hash); | ||
| lock.unlock(); | ||
| acquire(hash, seq, reason); | ||
| } | ||
| catch (std::exception const& e) | ||
| { | ||
| JLOG(j_.warn()) | ||
| << "Exception thrown for acquiring new inbound ledger " << hash | ||
| << ": " << e.what(); | ||
| } | ||
| catch (...) | ||
| { | ||
| JLOG(j_.warn()) | ||
| << "Unknown exception thrown for acquiring new inbound ledger " | ||
| << hash; | ||
| } | ||
| lock.lock(); | ||
| pendingAcquires_.erase(hash); |
There was a problem hiding this comment.
The manual calls to unlock and lock still being here are rubbing me the wrong way. What about:
Suggested change
| std::unique_lock lock(acquiresMutex_); | |
| if (pendingAcquires_.contains(hash)) | |
| return; | |
| pendingAcquires_.insert(hash); | |
| lock.unlock(); | |
| acquire(hash, seq, reason); | |
| try | |
| { | |
| if (pendingAcquires_.contains(hash)) | |
| return; | |
| pendingAcquires_.insert(hash); | |
| lock.unlock(); | |
| acquire(hash, seq, reason); | |
| } | |
| catch (std::exception const& e) | |
| { | |
| JLOG(j_.warn()) | |
| << "Exception thrown for acquiring new inbound ledger " << hash | |
| << ": " << e.what(); | |
| } | |
| catch (...) | |
| { | |
| JLOG(j_.warn()) | |
| << "Unknown exception thrown for acquiring new inbound ledger " | |
| << hash; | |
| } | |
| lock.lock(); | |
| pendingAcquires_.erase(hash); | |
| try | |
| { | |
| { | |
| std::unique_lock lock(acquiresMutex_); | |
| if (pendingAcquires_.contains(hash)) | |
| return; | |
| pendingAcquires_.insert(hash); | |
| } | |
| acquire(hash, seq, reason); | |
| } | |
| catch (std::exception const& e) | |
| { | |
| JLOG(j_.warn()) | |
| << "Exception thrown for acquiring new inbound ledger " << hash | |
| << ": " << e.what(); | |
| } | |
| catch (...) | |
| { | |
| JLOG(j_.warn()) | |
| << "Unknown exception thrown for acquiring new inbound ledger " | |
| << hash; | |
| } | |
| std::unique_lock lock(acquiresMutex_); | |
| pendingAcquires_.erase(hash); |
There was a problem hiding this comment.
Sure, go ahead. Can also be lock_guard in that case if you want.
There was a problem hiding this comment.
I'm fine with leaving this as-is for now, but check out 7a24764
ximinez
approved these changes
Aug 29, 2024
ximinez
added a commit
that referenced
this pull request
Aug 29, 2024
* origin/pr/2.2.2-rc1: Review fixes and refactor: (#6)
ximinez
added a commit
that referenced
this pull request
Aug 30, 2024
ximinez
pushed a commit
that referenced
this pull request
Sep 2, 2024
1) refactor filtering of validations to specifically avoid concurrent checkAccept() calls for the same validation hash. 2) Log when duplicate concurrent inbound ledger and validation requests are filtered. 3) RAII for containers that track concurrent inbound ledger and validation requests. 4) Comment on when to asynchronously acquire inbound ledgers, which is possible to be always OK, but should have further review.
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.
concurrent checkAccept() calls for the same validation hash.
are filtered.
validation requests.
is possible to be always OK, but should have further review.
High Level Overview of Change
Context of Change
Type of Change
.gitignore, formatting, dropping support for older tooling)API Impact
libxrplchange (any change that may affectlibxrplor dependents oflibxrpl)This change is