Skip to content

Reenable BWC after memory limit api backport #60415

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.

Sign up for GitHub

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

Merged
Tim-Brooks merged 1 commit into from
Jul 29, 2020
+5 −8
Merged

Reenable BWC after memory limit api backport #60415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/60342" /* 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
3 changes: 1 addition & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/50_indexing_pressure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
---
"Indexing pressure memory limit":
- skip:
# Change to 7.9.99 on backport
version: " - 7.10.99"
version: " - 7.9.99"
reason: "memory limit was added in 7.10"
features: [arbitrary_key]

Expand Down
6 changes: 2 additions & 4 deletions server/src/main/java/org/elasticsearch/index/stats/IndexingPressureStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public IndexingPressureStats(StreamInput in) throws IOException {
primaryRejections = in.readVLong();
replicaRejections = in.readVLong();

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

// TODO: Change to 7.10 after backport
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
out.writeVLong(memoryLimit);
}
}
Expand Down