Skip to content

Add an assert to detect double decrementing of ingest metrics #81450

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

Merged
merged 5 commits into from
Dec 7, 2021
Merged

Add an assert to detect double decrementing of ingest metrics #81450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf3ee96
Make sure the current counter is never negative
joegallo Dec 7, 2021
416b1cf
Log any double decrements (up to once an hour)
joegallo Dec 7, 2021
1d33a01
Keep the assert, drop the logging
joegallo Dec 7, 2021
ea53640
Merge branch 'master' into ingest-metric-double-decrement
joegallo Dec 7, 2021
8b197dc
Spotless
joegallo Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/ingest/IngestMetric.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ void preIngest() {
* @param ingestTimeInNanos The time it took to perform the action.
*/
void postIngest(long ingestTimeInNanos) {
ingestCurrent.decrementAndGet();
long current = ingestCurrent.decrementAndGet();
assert current >= 0 : "ingest metric current count double-decremented";
this.ingestTimeInNanos.inc(ingestTimeInNanos);
ingestCount.inc();
}
Expand Down
14 changes: 14 additions & 0 deletions server/src/test/java/org/elasticsearch/ingest/IngestMetricTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,18 @@ public void testIngestTimeInNanos() {
assertThat(1L, equalTo(metric.createStats().getIngestTimeInMillis()));
}

public void testPostIngestDoubleDecrement() {
IngestMetric metric = new IngestMetric();

metric.preIngest();
assertThat(1L, equalTo(metric.createStats().getIngestCurrent()));

metric.postIngest(500000L);
assertThat(0L, equalTo(metric.createStats().getIngestCurrent()));

// the second postIngest triggers an assertion error
expectThrows(AssertionError.class, () -> metric.postIngest(500000L));
assertThat(-1L, equalTo(metric.createStats().getIngestCurrent()));
}

}