MockSearchService concurrency fix

henningandersen · henningandersen · commit 035670ad750b · 2019-09-25T21:26:32.000+02:00
Fixed MockSearchService concurrency, assertNoInFlightContext could have false negative result (rarely). Split out from elastic#45739 Closes elastic#47048
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ public MockSearchService(ClusterService clusterService,`
`74`	`74`
`75`	`75`	`@Override`
`76`	`76`	`protected void putContext(SearchContext context) {`
`77`		`- super.putContext(context);`
`78`	`77`	`addActiveContext(context);`
	`78`	`+ super.putContext(context);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`