@@ -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