Skip to content

Commit 0967888

Browse files
committed
Fix CCR tests that manipulate transport requests
We have some CCR tests where we use mock transport send rules to control the behavior that we desire in these tests. Namely, we want to simulate an exception being thrown on the leader side, or a variety of other situations. These send rules were put in place between the data nodes on each side. However, it might not be the case that these requests are being sent between data nodes. For example, a request that is handled on a non-data master node would not be sent from a data node. And it might not be the case that the request is sent to a data node, as it could be proxied through a non-data coordinating node. This commit addresses this by putting these send rules in places between all nodes on each side. Closes #39011 Closes #39201
1 parent 4171c2b commit 0967888

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ public void testRetentionLeaseIsTakenAtTheStartOfRecovery() throws Exception {
190190

191191
}
192192

193-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39011")
194193
public void testRetentionLeaseIsRenewedDuringRecovery() throws Exception {
195194
final String leaderIndex = "leader";
196195
final int numberOfShards = randomIntBetween(1, 3);
@@ -206,11 +205,11 @@ public void testRetentionLeaseIsRenewedDuringRecovery() throws Exception {
206205

207206
// block the recovery from completing; this ensures the background sync is still running
208207
final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
209-
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getDataNodes().values()) {
208+
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getNodes().values()) {
210209
final MockTransportService senderTransportService =
211210
(MockTransportService) getFollowerCluster().getInstance(TransportService.class, senderNode.value.getName());
212211
final ClusterStateResponse leaderClusterState = leaderClient().admin().cluster().prepareState().clear().setNodes(true).get();
213-
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getDataNodes().values()) {
212+
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getNodes().values()) {
214213
final MockTransportService receiverTransportService =
215214
(MockTransportService) getLeaderCluster().getInstance(TransportService.class, receiverNode.value.getName());
216215
senderTransportService.addSendBehavior(receiverTransportService,
@@ -401,12 +400,12 @@ public void testUnfollowRemovesRetentionLeases() throws Exception {
401400

402401
final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
403402
try {
404-
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getDataNodes().values()) {
403+
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getNodes().values()) {
405404
final MockTransportService senderTransportService =
406405
(MockTransportService) getFollowerCluster().getInstance(TransportService.class, senderNode.value.getName());
407406
final ClusterStateResponse leaderClusterState =
408407
leaderClient().admin().cluster().prepareState().clear().setNodes(true).get();
409-
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getDataNodes().values()) {
408+
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getNodes().values()) {
410409
final MockTransportService receiverTransportService =
411410
(MockTransportService) getLeaderCluster().getInstance(TransportService.class, receiverNode.value.getName());
412411
senderTransportService.addSendBehavior(receiverTransportService,
@@ -467,7 +466,6 @@ public void testUnfollowRemovesRetentionLeases() throws Exception {
467466
}
468467
}
469468

470-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/39201")
471469
public void testUnfollowFailsToRemoveRetentionLeases() throws Exception {
472470
final String leaderIndex = "leader";
473471
final String followerIndex = "follower";
@@ -491,12 +489,12 @@ public void testUnfollowFailsToRemoveRetentionLeases() throws Exception {
491489

492490
final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
493491
try {
494-
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getDataNodes().values()) {
492+
for (final ObjectCursor<DiscoveryNode> senderNode : followerClusterState.getState().nodes().getNodes().values()) {
495493
final MockTransportService senderTransportService =
496494
(MockTransportService) getFollowerCluster().getInstance(TransportService.class, senderNode.value.getName());
497495
final ClusterStateResponse leaderClusterState =
498496
leaderClient().admin().cluster().prepareState().clear().setNodes(true).get();
499-
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getDataNodes().values()) {
497+
for (final ObjectCursor<DiscoveryNode> receiverNode : leaderClusterState.getState().nodes().getNodes().values()) {
500498
final MockTransportService receiverTransportService =
501499
(MockTransportService) getLeaderCluster().getInstance(TransportService.class, receiverNode.value.getName());
502500
senderTransportService.addSendBehavior(receiverTransportService,

0 commit comments

Comments
 (0)