From a75e885854774960f62169ce8bc9976c59623ed5 Mon Sep 17 00:00:00 2001
From: Panagiotis Bailis <pmpailis@gmail.com>
Date: Thu, 25 Jul 2024 13:40:29 +0300
Subject: [PATCH] addressing test failures in search request validation due to
 randomly enabled scrolling

---
 .../action/search/TransportOpenPointInTimeAction.java       | 6 +-----
 .../org/elasticsearch/action/search/SearchRequestTests.java | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java
index 0019ab0573c6e..59c348d751c5d 100644
--- a/server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java
+++ b/server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.action.support.ChannelActionListener;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.routing.GroupShardsIterator;
 import org.elasticsearch.common.inject.Inject;
@@ -63,7 +62,6 @@ public class TransportOpenPointInTimeAction extends HandledTransportAction<OpenP
     private final NamedWriteableRegistry namedWriteableRegistry;
     private final TransportService transportService;
     private final SearchService searchService;
-    private final Client client;
 
     @Inject
     public TransportOpenPointInTimeAction(
@@ -72,8 +70,7 @@ public TransportOpenPointInTimeAction(
         ActionFilters actionFilters,
         TransportSearchAction transportSearchAction,
         SearchTransportService searchTransportService,
-        NamedWriteableRegistry namedWriteableRegistry,
-        Client client
+        NamedWriteableRegistry namedWriteableRegistry
     ) {
         super(TYPE.name(), transportService, actionFilters, OpenPointInTimeRequest::new, EsExecutors.DIRECT_EXECUTOR_SERVICE);
         this.transportService = transportService;
@@ -81,7 +78,6 @@ public TransportOpenPointInTimeAction(
         this.searchService = searchService;
         this.searchTransportService = searchTransportService;
         this.namedWriteableRegistry = namedWriteableRegistry;
-        this.client = client;
         transportService.registerRequestHandler(
             OPEN_SHARD_READER_CONTEXT_NAME,
             EsExecutors.DIRECT_EXECUTOR_SERVICE,
diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java
index 63dd47d8d51d2..84d5633e3d9a3 100644
--- a/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/search/SearchRequestTests.java
@@ -291,6 +291,7 @@ public boolean isCompound() {
                 }
             }));
             searchRequest.allowPartialSearchResults(true);
+            searchRequest.scroll((Scroll) null);
             ActionRequestValidationException validationErrors = searchRequest.validate();
             assertNotNull(validationErrors);
             assertEquals(1, validationErrors.validationErrors().size());
@@ -309,7 +310,7 @@ public void extractToSearchSourceBuilder(SearchSourceBuilder searchSourceBuilder
 
                 @Override
                 public String getName() {
-                    return "compound_retriever";
+                    return "not_a_compound_retriever";
                 }
 
                 @Override
@@ -326,6 +327,7 @@ protected int doHashCode() {
                 }
             }));
             searchRequest.allowPartialSearchResults(true);
+            searchRequest.scroll((Scroll) null);
             ActionRequestValidationException validationErrors = searchRequest.validate();
             assertNull(validationErrors);
         }
@@ -360,6 +362,7 @@ public boolean isCompound() {
                     return true;
                 }
             }));
+            searchRequest.scroll((Scroll) null);
             ActionRequestValidationException validationErrors = searchRequest.validate();
             assertNull(validationErrors);
         }