Merge branch 'main' into tvclean0

Author: jdconrad

test/framework/src/main/java/org/elasticsearch/datageneration/datasource/DefaultMappingParametersHandler.java

@@ -280,7 +280,7 @@ public static HashMap<String, Object> commonMappingParameters() {
         return map;
     }
 
-    public static Object extendedDocValuesParams() {
+    protected Object extendedDocValuesParams() {
         // TODO: Remove this case when FieldMapper.DocValuesParameter.EXTENDED_DOC_VALUES_PARAMS_FF is removed.
         if (Build.current().isSnapshot() == false) {
             return ESTestCase.randomBoolean();

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/AbstractLogsdbRollingUpgradeTestCase.java

@@ -13,6 +13,8 @@
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.util.Version;
 import org.elasticsearch.test.rest.ESRestTestCase;
+import org.elasticsearch.test.rest.TestFeatureService;
+import org.junit.Before;
 import org.junit.ClassRule;
 
 import java.io.IOException;
@@ -21,6 +23,22 @@ public abstract class AbstractLogsdbRollingUpgradeTestCase extends ESRestTestCas
     private static final String USER = "admin-user";
     private static final String PASS = "x-pack-test-password";
 
+    private static TestFeatureService oldClusterTestFeatureService;
+
+    @Before
+    public void retainOldClusterTestFeatureService() {
+        if (oldClusterTestFeatureService == null) {
+            assert testFeatureServiceInitialized() : "testFeatureService must be initialized, see ESRestTestCase#initClient";
+            oldClusterTestFeatureService = testFeatureService;
+        }
+    }
+
+    protected static boolean oldClusterHasFeature(String featureId) {
+        assert oldClusterTestFeatureService != null
+            : "testFeatureService of old cluster cannot be accessed before initialization is complete";
+        return oldClusterTestFeatureService.clusterHasFeature(featureId);
+    }
+
     @ClassRule
     public static final ElasticsearchCluster cluster = Clusters.oldVersionCluster(USER, PASS);
 

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/RandomizedRollingUpgradeIT.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.datageneration.datasource.DataSourceHandler;
 import org.elasticsearch.datageneration.datasource.DataSourceRequest;
 import org.elasticsearch.datageneration.datasource.DataSourceResponse;
+import org.elasticsearch.datageneration.datasource.DefaultMappingParametersHandler;
 import org.elasticsearch.datageneration.datasource.MultifieldAddonHandler;
 import org.elasticsearch.datageneration.matchers.MatchResult;
 import org.elasticsearch.datageneration.matchers.Matcher;
@@ -82,6 +83,15 @@ public DataSourceResponse.FieldTypeGenerator handle(DataSourceRequest.FieldTypeG
                         return new DataSourceResponse.FieldTypeGenerator.FieldTypeInfo(ESTestCase.randomFrom(options));
                     });
                 }
+            }, new DefaultMappingParametersHandler() {
+                @Override
+                protected Object extendedDocValuesParams() {
+                    if (oldClusterHasFeature("mapper.keyword.store_high_cardinality_in_binary_doc_values")) {
+                        return super.extendedDocValuesParams();
+                    }
+
+                    return ESTestCase.randomBoolean();
+                }
             }))
             .withDataSourceHandlers(List.of(MultifieldAddonHandler.STRING_TYPE_HANDLER))
             // TODO: Remove ASCIIStringHandlers once the test has stabilized