Skip to content

Commit d159f64

Browse files
committed
Update version for serialization of allowed system indices
This commit updates the serialization for allowed system indices after the backport of the work and also re-enables bwc compatibility tests. Relates elastic#52385 Relates elastic#53035 Relates elastic#53062
1 parent acde68c commit d159f64

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ task verifyVersions {
219219
* after the backport of the backcompat code is complete.
220220
*/
221221

222-
boolean bwc_tests_enabled = false
223-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/52385" /* place a PR link here when committing bwc changes */
222+
boolean bwc_tests_enabled = true
223+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
224224
if (bwc_tests_enabled == false) {
225225
if (bwc_tests_disabled_issue.isEmpty()) {
226226
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/common/util/concurrent/ThreadContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public static Tuple<Map<String, String>, Map<String, Set<String>>> readHeadersFr
272272
}
273273

274274
public static List<String> readAllowedSystemIndices(StreamInput in) throws IOException {
275-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO update version on backport
275+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
276276
return in.readOptionalStringList();
277277
} else {
278278
return emptyList();
@@ -663,7 +663,7 @@ private void writeTo(StreamOutput out, Map<String, String> defaultHeaders) throw
663663
}
664664

665665
out.writeMap(responseHeaders, StreamOutput::writeString, StreamOutput::writeStringCollection);
666-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO update version on backport
666+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
667667
out.writeOptionalStringCollection(allowedSystemIndexPatterns);
668668
}
669669
}

0 commit comments

Comments
 (0)