Skip to content

[Test] Fix race in BlockRefreshUponIndexCreationIT #154991

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

Open
szybia wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −11
Open

[Test] Fix race in BlockRefreshUponIndexCreationIT #154991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,6 @@ tests:
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=indices.sort/30_multi_value/Index Sort with doc_values multi_value false - integer}
issue: https://github.com/elastic/elasticsearch/issues/154602
- class: org.elasticsearch.xpack.stateless.recovery.BlockRefreshUponIndexCreationIT
method: testIndexWithZeroReplicasAndAutoExpandReplicasHasClusterBlocks
issue: https://github.com/elastic/elasticsearch/issues/154605
- class: org.elasticsearch.xpack.stateless.commits.StatelessCommitServiceTests
method: testFullyUploadedListenerDoesNotFireBeforeItsCopyCompletes
issue: https://github.com/elastic/elasticsearch/issues/154606
Expand Down
26 changes: 18 additions & 8 deletions ...Test/java/org/elasticsearch/xpack/stateless/recovery/BlockRefreshUponIndexCreationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.elasticsearch.xpack.stateless.recovery;

import org.elasticsearch.action.ActionFuture;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.readonly.AddIndexBlockRequest;
import org.elasticsearch.action.admin.indices.readonly.RemoveIndexBlockRequest;
Expand All @@ -22,6 +23,7 @@
import org.elasticsearch.action.search.TransportClosePointInTimeAction;
import org.elasticsearch.action.search.TransportOpenPointInTimeAction;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.SubscribableListener;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
Expand All @@ -42,6 +44,7 @@
import org.elasticsearch.xpack.stateless.AbstractStatelessPluginIntegTestCase;
import org.elasticsearch.xpack.stateless.StatelessPlugin;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -486,15 +489,23 @@ public void testIndexWithZeroReplicasAndAutoExpandReplicasHasClusterBlocks() thr
);
String searchNodeName = startSearchNode();

// Intercept TransportRegisterCommitForRecoveryAction on the search node. This action is sent
// by the search node to register its shard copy during recovery; until it completes the shard
// stays in RECOVERING (not STARTED)
Queue<CheckedRunnable<Exception>> blockedRegistrations = new ConcurrentLinkedQueue<>();
// Intercept TransportRegisterCommitForRecoveryAction on the search node. This action is sent by the search
// node to register its shard copy during recovery; until it completes the shard stays in RECOVERING (not
// STARTED). Hold every such send until the test releases them: once released, the held send(s) and any
// later retry / re-allocation send are forwarded immediately (a completed SubscribableListener runs late
// subscribers inline), so recovery can never get stuck on a send the test forgot to forward.
CountDownLatch recoveryBlockedLatch = new CountDownLatch(1);
SubscribableListener<Void> releaseRegistrations = new SubscribableListener<>();
MockTransportService.getInstance(searchNodeName).addSendBehavior((connection, requestId, action, request, options) -> {
if (action.equals(TransportRegisterCommitForRecoveryAction.NAME)) {
blockedRegistrations.add(() -> connection.sendRequest(requestId, action, request, options));
recoveryBlockedLatch.countDown();
releaseRegistrations.addListener(ActionListener.running(() -> {
try {
connection.sendRequest(requestId, action, request, options);
} catch (IOException e) {
throw new AssertionError(e);
}
}));
} else {
connection.sendRequest(requestId, action, request, options);
}
Expand Down Expand Up @@ -526,9 +537,8 @@ public void testIndexWithZeroReplicasAndAutoExpandReplicasHasClusterBlocks() thr
assertNoSearchHits(prepareSearch(indexName).setQuery(new MatchAllQueryBuilder()));
}

var registration = blockedRegistrations.poll();
assertNotNull(registration);
registration.run();
// Release the held registration(s); any subsequent retry / re-allocation send is forwarded inline.
releaseRegistrations.onResponse(null);

assertAcked(createIndexFuture.actionGet());
ensureGreen(indexName);
Expand Down
Loading