honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test: weaken assertion in fix sliced reindex test 

This test was using initial count of slices instead of the count
of unfinished slices to pick the expected throttle. Unfortunely
due to race conditions the actual rethrottle count is between the
two. So we weaken the assertion from "the new throttle is exactly X"
to "the new throttle is between X and Y (inclusive)".
This commit is contained in:
Nik Everett 2017-02-03 10:31:57 -05:00
parent 22e64bdf4f
commit 9ca871af7e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/reindex/src/test/java/org/elasticsearch/index/reindex/RethrottleTests.java
View File

@ -33,6 +33,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@ -120,9 +121,15 @@ public class RethrottleTests extends ReindexTestCase {
assertEquals(newRequestsPerSecond, status.getRequestsPerSecond(), Float.MIN_NORMAL); assertEquals(newRequestsPerSecond, status.getRequestsPerSecond(), Float.MIN_NORMAL);
} else { } else {
/* Check that at least one slice was rethrottled. We won't always rethrottle all of them because they might have completed. /* Check that at least one slice was rethrottled. We won't always rethrottle all of them because they might have completed.
* With multiple slices these numbers might not add up perfectly, thus the 0.0001f. */ * With multiple slices these numbers might not add up perfectly, thus the 1.01F. */
float expectedSliceRequestsPerSecond = newRequestsPerSecond == Float.POSITIVE_INFINITY ? Float.POSITIVE_INFINITY long unfinished = status.getSliceStatuses().stream()
: newRequestsPerSecond / request.request().getSlices(); .filter(slice -> slice != null)
.filter(slice -> slice.getStatus().getTotal() > slice.getStatus().getSuccessfullyProcessed())
.count();
float maxExpectedSliceRequestsPerSecond = newRequestsPerSecond == Float.POSITIVE_INFINITY ?
Float.POSITIVE_INFINITY : (newRequestsPerSecond / unfinished) * 1.01F;
float minExpectedSliceRequestsPerSecond = newRequestsPerSecond == Float.POSITIVE_INFINITY ?
Float.POSITIVE_INFINITY : (newRequestsPerSecond / request.request().getSlices()) * 0.99F;
boolean oneSliceRethrottled = false; boolean oneSliceRethrottled = false;
float totalRequestsPerSecond = 0; float totalRequestsPerSecond = 0;
for (BulkByScrollTask.StatusOrException statusOrException : status.getSliceStatuses()) { for (BulkByScrollTask.StatusOrException statusOrException : status.getSliceStatuses()) {
@ -134,10 +141,12 @@ public class RethrottleTests extends ReindexTestCase {
assertNull(statusOrException.getException()); assertNull(statusOrException.getException());
BulkByScrollTask.Status slice = statusOrException.getStatus(); BulkByScrollTask.Status slice = statusOrException.getStatus();
if (slice.getTotal() > slice.getSuccessfullyProcessed()) { if (slice.getTotal() > slice.getSuccessfullyProcessed()) {
assertEquals(expectedSliceRequestsPerSecond, slice.getRequestsPerSecond(), expectedSliceRequestsPerSecond * 0.0001f); // This slice reports as not having completed so it should have been processed.
assertThat(slice.getRequestsPerSecond(), both(greaterThanOrEqualTo(minExpectedSliceRequestsPerSecond))
.and(lessThanOrEqualTo(maxExpectedSliceRequestsPerSecond)));
} }
if (Math.abs(expectedSliceRequestsPerSecond - slice.getRequestsPerSecond()) <= expectedSliceRequestsPerSecond * 0.0001f if (minExpectedSliceRequestsPerSecond <= slice.getRequestsPerSecond()
|| expectedSliceRequestsPerSecond == slice.getRequestsPerSecond()) { && slice.getRequestsPerSecond() <= maxExpectedSliceRequestsPerSecond) {
oneSliceRethrottled = true; oneSliceRethrottled = true;
} }
totalRequestsPerSecond += slice.getRequestsPerSecond(); totalRequestsPerSecond += slice.getRequestsPerSecond();