From 035670ad750bba1d44100f88c57c0ab7dbc0cad2 Mon Sep 17 00:00:00 2001
From: Henning Andersen <henning.andersen@elastic.co>
Date: Wed, 25 Sep 2019 21:26:32 +0200
Subject: [PATCH] MockSearchService concurrency fix

Fixed MockSearchService concurrency, assertNoInFlightContext could
have false negative result (rarely).

Split out from #45739
Closes #47048
---
 .../main/java/org/elasticsearch/search/MockSearchService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
index b9d9ff3cfc9bb..c1ebb1213495b 100644
--- a/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
+++ b/test/framework/src/main/java/org/elasticsearch/search/MockSearchService.java
@@ -74,8 +74,8 @@ public MockSearchService(ClusterService clusterService,
 
     @Override
     protected void putContext(SearchContext context) {
-        super.putContext(context);
         addActiveContext(context);
+        super.putContext(context);
     }
 
     @Override