Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version for serialization of allowed system indices #53085

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ task verifyVersions {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https:/elastic/elasticsearch/pull/52385" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public static Tuple<Map<String, String>, Map<String, Set<String>>> readHeadersFr
}

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

out.writeMap(responseHeaders, StreamOutput::writeString, StreamOutput::writeStringCollection);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO update version on backport
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
out.writeOptionalStringCollection(allowedSystemIndexPatterns);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2369,15 +2369,15 @@ public String executor() {
assertEquals(1, transportStats.getRxCount());
assertEquals(2, transportStats.getTxCount());
assertEquals(25, transportStats.getRxSize().getBytes());
assertEquals(111, transportStats.getTxSize().getBytes());
assertEquals(113, transportStats.getTxSize().getBytes());
});
sendResponseLatch.countDown();
responseLatch.await();
stats = serviceC.transport.getStats(); // response has been received
assertEquals(2, stats.getRxCount());
assertEquals(2, stats.getTxCount());
assertEquals(50, stats.getRxSize().getBytes());
assertEquals(111, stats.getTxSize().getBytes());
assertEquals(52, stats.getRxSize().getBytes());
assertEquals(113, stats.getTxSize().getBytes());
} finally {
serviceC.close();
}
Expand Down Expand Up @@ -2484,7 +2484,7 @@ public String executor() {
assertEquals(1, transportStats.getRxCount());
assertEquals(2, transportStats.getTxCount());
assertEquals(25, transportStats.getRxSize().getBytes());
assertEquals(111, transportStats.getTxSize().getBytes());
assertEquals(113, transportStats.getTxSize().getBytes());
});
sendResponseLatch.countDown();
responseLatch.await();
Expand All @@ -2498,8 +2498,8 @@ public String executor() {
String failedMessage = "Unexpected read bytes size. The transport exception that was received=" + exception;
// 49 bytes are the non-exception message bytes that have been received. It should include the initial
// handshake message and the header, version, etc bytes in the exception message.
assertEquals(failedMessage, 53 + streamOutput.bytes().length(), stats.getRxSize().getBytes());
assertEquals(111, stats.getTxSize().getBytes());
assertEquals(failedMessage, 55 + streamOutput.bytes().length(), stats.getRxSize().getBytes());
assertEquals(113, stats.getTxSize().getBytes());
} finally {
serviceC.close();
}
Expand Down