send request to release search context in finally block to be on the save side

src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java

@@ -104,12 +104,15 @@ public class TransportSearchDfsQueryAndFetchAction extends TransportSearchTypeAc
 
                 @Override
                 public void onFailure(Throwable t) {
+                    try {
                         onSecondPhaseFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    } finally {
                         // the query might not have been executed at all (for example because thread pool rejected execution)
                         // and the search context that was created in dfs phase might not be released.
                         // release it again to be in the safe side
                         sendReleaseSearchContext(querySearchRequest.id(), node);
                     }
+                }
             });
         }
 

src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java

@@ -113,12 +113,15 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
 
                 @Override
                 public void onFailure(Throwable t) {
+                    try {
                         onQueryFailure(t, querySearchRequest, shardIndex, dfsResult, counter);
+                    } finally {
                         // the query might not have been executed at all (for example because thread pool rejected execution)
                         // and the search context that was created in dfs phase might not be released.
                         // release it again to be in the safe side
                         sendReleaseSearchContext(querySearchRequest.id(), node);
                     }
+                }
             });
         }