Tests: clean search scroll at the end of SearchCancellationIT

Under some rare conditions search cancellation response might not fully clean scroll context. For now this commit adds the cleaning operation to the test, and we will address the root cause in #21511
elastic · Nov 11, 2016 · 0b2b64b · 0b2b64b
1 parent 0f15b79
commit 0b2b64b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java b/core/src/test/java/org/elasticsearch/search/SearchCancellationIT.java
@@ -193,7 +193,12 @@ public void testCancellationOfScrollSearches() throws Exception {
         awaitForBlock(plugins);
         cancelSearch(SearchAction.NAME);
         disableBlocks(plugins);
-        ensureSearchWasCancelled(searchResponse);
+        SearchResponse response = ensureSearchWasCancelled(searchResponse);
+        if (response != null) {
+            // The response might not have failed on all shards - we need to clean scroll
+            logger.info("Cleaning scroll with id {}", response.getScrollId());
+            client().prepareClearScroll().addScrollId(response.getScrollId()).get();
+        }
     }