Skip to content

Do not verify unpromotable shards #93266

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

Draft
DaveCTurner wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Do not verify unpromotable shards #93266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f268b5
Do not verify unpromotable shards
DaveCTurner Jan 26, 2023
453fe38
Mockity-mock
DaveCTurner Jan 26, 2023
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
4 changes: 4 additions & 0 deletions ...a/org/elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ protected void shardOperationOnReplica(ShardRequest shardRequest, IndexShard rep
}

private void executeShardOperation(final ShardRequest request, final IndexShard indexShard) throws IOException {
if (indexShard.routingEntry().isPromotableToPrimary() == false) {
return;
}

final ShardId shardId = indexShard.shardId();
if (indexShard.getActiveOperationsCount() != IndexShard.OPERATIONS_BLOCKED) {
throw new IllegalStateException("Index shard " + shardId + " is not blocking all operations during closing");
Expand Down
4 changes: 4 additions & 0 deletions .../elasticsearch/action/admin/indices/close/TransportVerifyShardBeforeCloseActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.ShardRoutingState;
import org.elasticsearch.cluster.routing.TestShardRouting;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue;
Expand Down Expand Up @@ -94,6 +95,9 @@ public void setUp() throws Exception {

final ShardId shardId = new ShardId("index", "_na_", randomIntBetween(0, 3));
when(indexShard.shardId()).thenReturn(shardId);
when(indexShard.routingEntry()).thenReturn(
TestShardRouting.newShardRouting(shardId, randomAlphaOfLength(5), true, ShardRoutingState.STARTED)
);

clusterService = createClusterService(threadPool);

Expand Down