github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace Version with String in YAML framework, pushing Version parsing where is actually needed (#103311)

Browse source 
* Pushing down node versions as strings

Deferring Version parsing to the actual places where a minimum node version/common cluster version is needed; eventually this will be completely lazy and/or replaced by other checks (e.g. features).
Combine versions, oses and features in multi-cluster YAML test contexts.
This commit is contained in:
Lorenzo Dematté 2024-01-03 09:29:40 +01:00 • committed by GitHub
parent 28362cd9b4
commit cea88cbeec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 263 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

41
qa/multi-cluster-search/src/test/java/org/elasticsearch/search/MultiClusterSearchYamlTestSuiteIT.java
View file

@ -13,26 +13,27 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.tests.util.TimeUnits;
import org.elasticsearch.Version;
import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.test.rest.TestFeatureService;
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
import org.elasticsearch.test.rest.yaml.ClientYamlTestClient;
import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext;
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
import org.junit.BeforeClass;
import java.util.function.Predicate;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@TimeoutSuite(millis = 5 * TimeUnits.MINUTE) // to account for slow as hell VMs
public class MultiClusterSearchYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
private static Version remoteEsVersion = null;
private static String remoteEsVersion = null;
@BeforeClass
public static void determineRemoteClusterMinimumVersion() {
public static void readRemoteClusterVersion() {
String remoteClusterVersion = System.getProperty("tests.rest.remote_cluster_version");
if (remoteClusterVersion != null) {
remoteEsVersion = Version.fromString(remoteClusterVersion);
remoteEsVersion = remoteClusterVersion;
}
}
@ -40,26 +41,32 @@ public class MultiClusterSearchYamlTestSuiteIT extends ESClientYamlSuiteTestCase
protected ClientYamlTestExecutionContext createRestTestExecutionContext(
ClientYamlTestCandidate clientYamlTestCandidate,
ClientYamlTestClient clientYamlTestClient,
final Version esVersion,
final Predicate<String> clusterFeaturesPredicate,
final String os
final Set<String> nodesVersions,
final TestFeatureService testFeatureService,
final Set<String> osSet
) {
/*
* Since the esVersion is used to skip tests in ESClientYamlSuiteTestCase, we also take into account the
* remote cluster version here and return it if it is lower than the local client version. This is used to
* skip tests if some feature isn't available on the remote cluster yet.
* remote cluster version here. This is used to skip tests if some feature isn't available on the remote cluster yet.
*/
final Version commonEsVersion = remoteEsVersion != null && remoteEsVersion.before(esVersion) ? remoteEsVersion : esVersion;
// TODO: same for os and features
final Set<String> commonVersions;
if (remoteEsVersion == null || nodesVersions.contains(remoteEsVersion)) {
commonVersions = nodesVersions;
} else {
var versionsCopy = new HashSet<>(nodesVersions);
versionsCopy.add(remoteEsVersion);
commonVersions = Collections.unmodifiableSet(versionsCopy);
}
// TODO: same for os and features. Better to do that once this test(s) have been migrated to the new ElasticsearchCluster-based
// framework. See CcsCommonYamlTestSuiteIT for example.
return new ClientYamlTestExecutionContext(
clientYamlTestCandidate,
clientYamlTestClient,
randomizeContentType(),
commonEsVersion,
ESRestTestCase::clusterHasFeature,
os
commonVersions,
testFeatureService,
osSet
);
}