Skip to content

Commit 50c5623

Browse files
authored
Reenable BWC after memory limit api backport (#60415)
This commit reenables BWC and updates version constants after the bacport of #60342.
1 parent 944a6c2 commit 50c5623

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
174174
* after the backport of the backcompat code is complete.
175175
*/
176176

177-
boolean bwc_tests_enabled = false
178-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/60342" /* place a PR link here when committing bwc changes */
177+
boolean bwc_tests_enabled = true
178+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
179179
if (bwc_tests_enabled == false) {
180180
if (bwc_tests_disabled_issue.isEmpty()) {
181181
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
---
3333
"Indexing pressure memory limit":
3434
- skip:
35-
# Change to 7.9.99 on backport
36-
version: " - 7.10.99"
35+
version: " - 7.9.99"
3736
reason: "memory limit was added in 7.10"
3837
features: [arbitrary_key]
3938

server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ public IndexingPressureStats(StreamInput in) throws IOException {
6161
primaryRejections = in.readVLong();
6262
replicaRejections = in.readVLong();
6363

64-
// TODO: Change to 7.10 after backport
65-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
64+
if (in.getVersion().onOrAfter(Version.V_7_10_0)) {
6665
memoryLimit = in.readVLong();
6766
} else {
6867
memoryLimit = -1L;
@@ -103,8 +102,7 @@ public void writeTo(StreamOutput out) throws IOException {
103102
out.writeVLong(primaryRejections);
104103
out.writeVLong(replicaRejections);
105104

106-
// TODO: Change to 7.10 after backport
107-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
105+
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
108106
out.writeVLong(memoryLimit);
109107
}
110108
}

0 commit comments

Comments
 (0)