Skip to content
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

[Segment Replication] Fix Flaky test SegmentReplicationRelocationIT.testPrimaryRelocation #10701

Merged
merged 9 commits into from
Oct 20, 2023
Merged

[Segment Replication] Fix Flaky test SegmentReplicationRelocationIT.testPrimaryRelocation #10701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6656af2
Add primary mode check before assserting on primary mode.
Rishikesh1159 Oct 18, 2023
b036e31
Merge branch 'opensearch-project:main' into fix-10029
Rishikesh1159 Oct 19, 2023
1b5e7c5
remove unnecessary shardRouting check.
Rishikesh1159 Oct 19, 2023
9ce42c4
Merge branch 'fix-10029' of https://github.com/Rishikesh1159/OpenSear…
Rishikesh1159 Oct 19, 2023
1192ee3
Add test logging.
Rishikesh1159 Oct 19, 2023
3ebdd12
Merge branch 'opensearch-project:main' into fix-10029
Rishikesh1159 Oct 19, 2023
e07dc80
Addressing comments on PR.
Rishikesh1159 Oct 20, 2023
f98e3a2
Merge branch 'fix-10029' of https://github.com/Rishikesh1159/OpenSear…
Rishikesh1159 Oct 20, 2023
3575549
Merge branch 'opensearch-project:main' into fix-10029
Rishikesh1159 Oct 20, 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
2 changes: 2 additions & 0 deletions ...alClusterTest/java/org/opensearch/indices/replication/SegmentReplicationRelocationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.opensearch.index.shard.IndexShard;
import org.opensearch.indices.IndicesService;
import org.opensearch.test.OpenSearchIntegTestCase;
import org.opensearch.test.junit.annotations.TestLogging;
import org.opensearch.test.transport.MockTransportService;
import org.opensearch.transport.TransportService;

Expand Down Expand Up @@ -55,6 +56,7 @@ private void createIndex(int replicaCount) {
* This test verifies happy path when primary shard is relocated newly added node (target) in the cluster. Before
* relocation and after relocation documents are indexed and documents are verified
*/
@TestLogging(reason = "Getting trace logs from replication,shard and allocation package", value = "org.opensearch.indices.replication:TRACE, org.opensearch.index.shard:TRACE, org.opensearch.cluster.routing.allocation:TRACE")
public void testPrimaryRelocation() throws Exception {
final String oldPrimary = internalCluster().startNode();
createIndex(1);
Expand Down
9 changes: 0 additions & 9 deletions server/src/main/java/org/opensearch/indices/replication/SegmentReplicationSourceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import org.opensearch.OpenSearchException;
import org.opensearch.action.StepListener;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.routing.IndexShardRoutingTable;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.common.logging.Loggers;
import org.opensearch.common.util.CancellableThreads;
import org.opensearch.common.util.concurrent.ListenableFuture;
Expand All @@ -22,7 +20,6 @@
import org.opensearch.core.action.ActionListener;
import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.store.StoreFileMetadata;
import org.opensearch.indices.recovery.DelayRecoveryException;
import org.opensearch.indices.recovery.FileChunkWriter;
import org.opensearch.indices.recovery.MultiChunkTransfer;
import org.opensearch.indices.replication.common.CopyState;
Expand Down Expand Up @@ -146,12 +143,6 @@ public synchronized void sendFiles(GetSegmentFilesRequest request, ActionListene
);
};
cancellableThreads.checkForCancel();
final IndexShardRoutingTable routingTable = shard.getReplicationGroup().getRoutingTable();
ShardRouting targetShardRouting = routingTable.getByAllocationId(request.getTargetAllocationId());
if (targetShardRouting == null) {
logger.debug("delaying replication of {} as it is not listed as assigned to target node {}", shard.shardId(), targetNode);
throw new DelayRecoveryException("source node does not have the shard listed in its state as allocated on the node");
}

final StepListener<Void> sendFileStep = new StepListener<>();
Set<String> storeFiles = new HashSet<>(Arrays.asList(shard.store().directory().listAll()));
Expand Down