honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race in RecoveryRequestTrackerTests (#59187)

Browse Source 
Currently in the recovery request tracker tests we place the futures
into the future map on the GENERIC thread. It is possible that the test
has already advanced past the point where we block on these futures
before they are placed in the map. This introduces other potential
failures as we expect all futures have been completed. This commit fixes
the test by places the futures in the map prior to dispatching.
This commit is contained in:
Tim Brooks 2020-07-07 14:33:05 -06:00
parent 2e71db71b6
commit b1c3ad8f59
No known key found for this signature in database
GPG Key ID: C2AA3BB91A889E77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java
View File

@ -59,11 +59,11 @@ public class RecoveryRequestTrackerTests extends ESTestCase {
final long seqNo = j;
int iterations = randomIntBetween(2, 5);
for (int i = 0; i < iterations; ++i) {
PlainActionFuture<Void> future = PlainActionFuture.newFuture();
Set<PlainActionFuture<Void>> set = seqToResult.computeIfAbsent(seqNo, (k) -> ConcurrentCollections.newConcurrentSet());
set.add(future);
threadPool.generic().execute(() -> {
PlainActionFuture<Void> future = PlainActionFuture.newFuture();
ActionListener<Void> listener = requestTracker.markReceivedAndCreateListener(seqNo, future);
Set<PlainActionFuture<Void>> set = seqToResult.computeIfAbsent(seqNo, (k) -> ConcurrentCollections.newConcurrentSet());
set.add(future);
if (listener != null) {
boolean added = seqNosReturned.add(seqNo);
// Ensure that we only return 1 future per sequence number