Bring over merge metrics from stateless #128617
Open
+353
−71
Conversation
This file contains hidden or 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
elasticsearchmachine
added
v9.1.0
serverless-linked
BrianRothermich
force-pushed
the
brothermich/ES-9687--metrics
branch
2 times, most recently
from
61f0a99 to
79917cd
Compare
elasticsearchmachine
added
the
needs:triage
BrianRothermich
added
>non-issue
:Distributed Indexing/Distributed
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
elasticsearchmachine
added
the
Team:Distributed Indexing
BrianRothermich
requested review from
albertzaharovits
and removed request for
a team
| try { | ||
| beforeMerge(onGoingMerge); | ||
| try { | ||
| if (mergeStartTimeNS.compareAndSet(0L, System.nanoTime()) == false) { | ||
| throw new IllegalStateException("The merge task is already started or aborted"); | ||
| } | ||
| mergeTracking.mergeStarted(onGoingMerge); | ||
| mergeMetrics.moveQueuedMergeBytesToRunning(onGoingMerge, mergeMemoryEstimateBytes); |
There was a problem hiding this comment.
I think this should also be invoked on the "abort" merge code path.
There was a problem hiding this comment.
Good catch. Updated
| @@ -79,7 +79,8 @@ public void testMergesExecuteInSizeOrder() throws IOException { | |||
| new ShardId("index", "_na_", 1), | |||
| IndexSettingsModule.newIndexSettings("index", Settings.EMPTY), | |||
| threadPoolMergeExecutorService, | |||
| merge -> 0 | |||
| merge -> 0, | |||
| MergeMetrics.NOOP | |||
There was a problem hiding this comment.
Can you please make these tests (in this class) take a mock(MergeMetrics.class) and assert the invocations on it (e.g. when merge tasks are run/aborted), in order to have some test coverage for the metrics code too.
There was a problem hiding this comment.
Updated some tests to verify the metrics reporting in 629d70a
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.
Relates to an effort to combine the merge schedulers from stateless and stateful. The stateless merge scheduler has MergeMetrics that we want in both stateless and stateful. This PR copies over the merge metrics from the stateless merge scheduler into the combined merge scheduler.
Relates ES-9687