Fix failing SearchQueryThenFetchAsyncActionTests (#114630)

The version randomization has been changed recently with the unintended effect
that now randomized "old" and "new" versions can be the same, and new versions
can even be lower than old versions. This change corrects this by going back to
the previous version randomization logic.

Closes #114593

Author: cbuescher

muted-tests.yml

@@ -297,15 +297,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
   method: test {categorize.Categorize SYNC}
   issue: https://github.com/elastic/elasticsearch/issues/113722
-- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
-  method: testMinimumVersionSameAsNewVersion
-  issue: https://github.com/elastic/elasticsearch/issues/114593
 - class: org.elasticsearch.xpack.security.support.SecurityIndexManagerIntegTests
   method: testOnIndexAvailableForSearchIndexAlreadyAvailable
   issue: https://github.com/elastic/elasticsearch/issues/114608
-- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
-  method: testMinimumVersionShardDuringPhaseExecution
-  issue: https://github.com/elastic/elasticsearch/issues/114611
 - class: org.elasticsearch.kibana.KibanaThreadPoolIT
   method: testBlockedThreadPoolsRejectUserRequests
   issue: https://github.com/elastic/elasticsearch/issues/113939

server/src/test/java/org/elasticsearch/action/search/SearchQueryThenFetchAsyncActionTests.java

@@ -258,17 +258,21 @@ public void run() {
         }
     }
 
-    public void testMinimumVersionSameAsNewVersion() throws Exception {
+    public void testMinimumVersionSameAsNewVersion() {
         var newVersion = VersionInformation.CURRENT;
         var oldVersion = new VersionInformation(
-            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
+            VersionUtils.randomVersionBetween(
+                random(),
+                Version.CURRENT.minimumCompatibilityVersion(),
+                VersionUtils.getPreviousVersion(newVersion.nodeVersion())
+            ),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );
         testMixedVersionsShardsSearch(newVersion, oldVersion, newVersion.nodeVersion());
     }
 
-    public void testMinimumVersionBetweenNewAndOldVersion() throws Exception {
+    public void testMinimumVersionBetweenNewAndOldVersion() {
         var oldVersion = new VersionInformation(
             VersionUtils.getFirstVersion(),
             IndexVersions.MINIMUM_COMPATIBLE,
@@ -290,8 +294,7 @@ public void testMinimumVersionBetweenNewAndOldVersion() throws Exception {
         testMixedVersionsShardsSearch(newVersion, oldVersion, minVersion);
     }
 
-    private void testMixedVersionsShardsSearch(VersionInformation oldVersion, VersionInformation newVersion, Version minVersion)
-        throws Exception {
+    private void testMixedVersionsShardsSearch(VersionInformation oldVersion, VersionInformation newVersion, Version minVersion) {
         final TransportSearchAction.SearchTimeProvider timeProvider = new TransportSearchAction.SearchTimeProvider(
             0,
             System.nanoTime(),
@@ -372,7 +375,6 @@ public void onResponse(SearchResponse response) {
                         responses.add(response);
                     }
 
-                ;
                 },
                 shardsIter,
                 timeProvider,
@@ -397,7 +399,11 @@ public void onResponse(SearchResponse response) {
     public void testMinimumVersionSameAsOldVersion() throws Exception {
         var newVersion = VersionInformation.CURRENT;
         var oldVersion = new VersionInformation(
-            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
+            VersionUtils.randomVersionBetween(
+                random(),
+                Version.CURRENT.minimumCompatibilityVersion(),
+                VersionUtils.getPreviousVersion(newVersion.nodeVersion())
+            ),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );
@@ -553,7 +559,11 @@ public void run() {
     public void testMinimumVersionShardDuringPhaseExecution() throws Exception {
         var newVersion = VersionInformation.CURRENT;
         var oldVersion = new VersionInformation(
-            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
+            VersionUtils.randomVersionBetween(
+                random(),
+                Version.CURRENT.minimumCompatibilityVersion(),
+                VersionUtils.getPreviousVersion(newVersion.nodeVersion())
+            ),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );