TransportVersionUtils#randomVersionBetween does not work with version…

… extensions (106119) Fixes elastic#106119
alexey-ivanov-es · Nov 4, 2024 · d4ab0db · d4ab0db
1 parent de9851a
commit d4ab0db
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/test/framework/src/main/java/org/elasticsearch/test/TransportVersionUtils.java b/test/framework/src/main/java/org/elasticsearch/test/TransportVersionUtils.java
@@ -63,7 +63,12 @@ public static TransportVersion randomVersionBetween(
         }
         int maxVersionIndex = ALL_VERSIONS.size() - 1;
         if (maxVersion != null) {
-            maxVersionIndex = Collections.binarySearch(ALL_VERSIONS, maxVersion);
+            // current version might be serverless one and therefore might be after the last version in ALL_VERSIONS
+            if (maxVersion.after(ALL_VERSIONS.getLast()) && maxVersion.onOrBefore(TransportVersion.current())) {
+                maxVersionIndex = ALL_VERSIONS.size() - 1;
+            } else {
+                maxVersionIndex = Collections.binarySearch(ALL_VERSIONS, maxVersion);
+            }
         }
         if (minVersionIndex < 0) {
             throw new IllegalArgumentException("minVersion [" + minVersion + "] does not exist.");