Merge branch 'peer-recovery-retention-leases' into 2019-07-25-prrl-integrate-recovery

DaveCTurner · DaveCTurner · commit ec7c42363778 · 2019-07-25T14:08:01.000+01:00
diff --git a/server/src/test/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java b/server/src/test/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java
@@ -86,6 +86,7 @@ protected int maximumNumberOfShards() {
         return 3;
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/44855")
     public void testCloseWhileRelocatingShards() throws Exception {
         final String[] indices = new String[randomIntBetween(3, 5)];
         final Map<String, Long> docsPerIndex = new HashMap<>();

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ protected int maximumNumberOfShards() {`
`86`	`86`	`return 3;`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/44855")`
`89`	`90`	`public void testCloseWhileRelocatingShards() throws Exception {`
`90`	`91`	`final String[] indices = new String[randomIntBetween(3, 5)];`
`91`	`92`	`final Map<String, Long> docsPerIndex = new HashMap<>();`