Skip to content

Commit 067fbb8

Browse files
committed
Backport periodic flush count to v6.3.0
Relates #29360
1 parent 263349f commit 067fbb8

File tree

2 files changed

+4
-4
lines changed
  • rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush
  • server/src/main/java/org/elasticsearch/index/flush

2 files changed

+4
-4
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
---
2626
"Flush stats":
2727
- skip:
28-
version: " - 6.99.99"
29-
reason: periodic flush stats is introduced in 7.0
28+
version: " - 6.2.99"
29+
reason: periodic flush stats is introduced in 6.3.0
3030
- do:
3131
indices.create:
3232
index: test

server/src/main/java/org/elasticsearch/index/flush/FlushStats.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static final class Fields {
114114
public void readFrom(StreamInput in) throws IOException {
115115
total = in.readVLong();
116116
totalTimeInMillis = in.readVLong();
117-
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
117+
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
118118
periodic = in.readVLong();
119119
}
120120
}
@@ -123,7 +123,7 @@ public void readFrom(StreamInput in) throws IOException {
123123
public void writeTo(StreamOutput out) throws IOException {
124124
out.writeVLong(total);
125125
out.writeVLong(totalTimeInMillis);
126-
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
126+
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
127127
out.writeVLong(periodic);
128128
}
129129
}

0 commit comments

Comments
 (0)