Expose master version in REST test context #30623
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit exposes the master version to the REST test context. This will be needed in a follow-up where the master version will be used to determine whether or not a certain warning header is expected.
|
Pinging @elastic/es-core-infra |
|
Here is the intended usage of this which I will implement in a follow-up PR: diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
index 7c6647d65f0..4aa6b4bd479 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java
@@ -20,6 +20,7 @@
package org.elasticsearch.test.rest.yaml.section;
import org.apache.logging.log4j.Logger;
+import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.Tuple;
@@ -233,7 +234,7 @@ public class DoSection implements ExecutableSection {
}
fail(formatStatusCodeMessage(response, catchStatusCode));
}
- checkWarningHeaders(response.getWarningHeaders());
+ checkWarningHeaders(response.getWarningHeaders(), executionContext.masterVersion());
} catch(ClientYamlTestResponseException e) {
ClientYamlTestResponse restTestResponse = e.getRestTestResponse();
if (!Strings.hasLength(catchParam)) {
@@ -259,7 +260,7 @@ public class DoSection implements ExecutableSection {
/**
* Check that the response contains only the warning headers that we expect.
*/
- void checkWarningHeaders(final List<String> warningHeaders) {
+ void checkWarningHeaders(final List<String> warningHeaders, final Version masterVersion) {
final List<String> unexpected = new ArrayList<>();
final List<String> unmatched = new ArrayList<>();
final List<String> missing = new ArrayList<>();
@@ -269,8 +270,18 @@ public class DoSection implements ExecutableSection {
for (final String header : warningHeaders) {
final Matcher matcher = WARNING_HEADER_PATTERN.matcher(header);
final boolean matches = matcher.matches();
- if (matches) {
- final String message = matcher.group(1);
+ final String message = matcher.group(1);
+ // noinspection StatementWithEmptyBody
+ if (masterVersion.before(Version.V_7_0_0_alpha1)
+ && message.equals("the default number of shards will change from [5] to [1] in 7.0.0; "
+ + "if you wish to continue using the default of [5] shards, "
+ + "you must manage this on the create index request or with an index template")) {
+ /*
+ * This warning header will come back in the vast majority of our tests that create an index. Rather than rewrite our
+ * tests to assert this warning header, we assume that it is expected.
+ */
+ }
+ else if (matches) {
if (expected.remove(message) == false) {
unexpected.add(header);
} |
jasontedor
commented
May 15, 2018
| } | ||
| ClientYamlTestClient clientYamlTestClient = initClientYamlTestClient(restSpec, restClient, hosts, esVersion); | ||
| final List<HttpHost> hosts = getClusterHosts(); | ||
| Tuple<Version, Version> versionVersionTuple = readVersionsFromCatNodes(adminClient()); |
There was a problem hiding this comment.
Note here that we use the admin client instead of the plain client. I think this means that we do not need the try/catch block anymore.
javanna
approved these changes
May 15, 2018
| if (ex.getResponse().getStatusLine().getStatusCode() == 403) { | ||
| logger.warn("Fallback to simple info '/' request, _cat/nodes is not authorized"); | ||
| esVersion = infoVersion; | ||
| logger.info("initializing yaml client, minimum es version: [{}] hosts: {}", esVersion, hosts); |
There was a problem hiding this comment.
isn't the catch needed anymore? not too familiar with it though, not sure why it's there
There was a problem hiding this comment.
seems like this is not needed as we switched to adminClient for this call
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit exposes the master version to the REST test context. This will be needed in a follow-up where the master version will be used to determine whether or not a certain warning header is expected.
Relates #30587