From c1037a7b2d1a18197d377d5a761944abd57e01fa Mon Sep 17 00:00:00 2001
From: Nhat Nguyen <nhat.nguyen@elastic.co>
Date: Sat, 13 Oct 2018 21:05:33 -0400
Subject: [PATCH] CCR/TEST: AwaitsFix testFailOverOnFollower

Tracked at #34412
---
 .../test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java   | 2 ++
 .../xpack/ccr/action/ShardFollowTaskReplicationTests.java       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
index 639e2b8d0eb6f..134c4a3141563 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/ShardChangesIT.java
@@ -373,6 +373,7 @@ public void afterBulk(long executionId, BulkRequest request, Throwable failure)
         assertMaxSeqNoOfUpdatesIsTransferred(resolveIndex("index1"), resolveIndex("index2"), numberOfShards);
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/34412")
     public void testFollowIndexAndCloseNode() throws Exception {
         internalCluster().ensureAtLeastNumDataNodes(3);
         String leaderIndexSettings = getIndexSettings(3, 1, singletonMap(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), "true"));
@@ -693,6 +694,7 @@ public void testUnfollowIndex() throws Exception {
         assertThat(client().prepareSearch("index2").get().getHits().getTotalHits(), equalTo(2L));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/34412")
     public void testFailOverOnFollower() throws Exception {
         int numberOfReplicas = between(1, 2);
         internalCluster().startMasterOnlyNode();
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java
index 559babdc9050e..5539bc6ae4764 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardFollowTaskReplicationTests.java
@@ -227,6 +227,7 @@ public void testChangeFollowerHistoryUUID() throws Exception {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/34412")
     public void testRetryBulkShardOperations() throws Exception {
         try (ReplicationGroup leaderGroup = createGroup(between(0, 1));
              ReplicationGroup followerGroup = createFollowGroup(between(1, 3))) {