Skip to content

Commit 748c13e

Browse files
committed
Adapt minimum versions for seq# power operations
After backporting #37977, #37857 and #37872
1 parent 54bbb72 commit 748c13e

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"Update with if_seq_no":
33

44
- skip:
5-
version: " - 6.99.99"
6-
reason: if_seq_no was added in 7.0
5+
version: " - 6.6.99"
6+
reason: if_seq_no was added in 6.7.0
77

88
- do:
99
catch: missing

server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ public void readFrom(StreamInput in) throws IOException {
912912
docAsUpsert = in.readBoolean();
913913
version = in.readLong();
914914
versionType = VersionType.fromValue(in.readByte());
915-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
915+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
916916
ifSeqNo = in.readZLong();
917917
ifPrimaryTerm = in.readVLong();
918918
}
@@ -960,7 +960,7 @@ public void writeTo(StreamOutput out) throws IOException {
960960
out.writeBoolean(docAsUpsert);
961961
out.writeLong(version);
962962
out.writeByte(versionType.getValue());
963-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
963+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
964964
out.writeZLong(ifSeqNo);
965965
out.writeVLong(ifPrimaryTerm);
966966
}

x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void readFrom(StreamInput in) throws IOException {
207207
} else {
208208
version = Versions.MATCH_ANY;
209209
}
210-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
210+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
211211
ifSeqNo = in.readZLong();
212212
ifPrimaryTerm = in.readVLong();
213213
} else {
@@ -228,7 +228,7 @@ public void writeTo(StreamOutput out) throws IOException {
228228
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
229229
out.writeZLong(version);
230230
}
231-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
231+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
232232
out.writeZLong(ifSeqNo);
233233
out.writeVLong(ifPrimaryTerm);
234234
}

x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void writeTo(StreamOutput out) throws IOException {
110110
super.writeTo(out);
111111
out.writeString(id);
112112
out.writeVLong(version);
113-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
113+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
114114
out.writeZLong(seqNo);
115115
out.writeVLong(primaryTerm);
116116
}
@@ -122,7 +122,7 @@ public void readFrom(StreamInput in) throws IOException {
122122
super.readFrom(in);
123123
id = in.readString();
124124
version = in.readVLong();
125-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
125+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
126126
seqNo = in.readZLong();
127127
primaryTerm = in.readVLong();
128128
} else {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void readFrom(StreamInput in) throws IOException {
100100
} else {
101101
version = Versions.MATCH_ANY;
102102
}
103-
if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
103+
if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
104104
seqNo = in.readZLong();
105105
primaryTerm = in.readVLong();
106106
}
@@ -124,7 +124,7 @@ public void writeTo(StreamOutput out) throws IOException {
124124
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
125125
out.writeZLong(version);
126126
}
127-
if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
127+
if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
128128
out.writeZLong(seqNo);
129129
out.writeVLong(primaryTerm);
130130
}

x-pack/plugin/src/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ setup:
224224
---
225225
"Test putting a watch with a redacted password with old seq no returns an error":
226226
- skip:
227-
version: " - 6.99.99"
228-
reason: seq no powered concurrency was added in 7.0.0
227+
version: " - 6.6.99"
228+
reason: seq no powered concurrency was added in 6.7.0
229229

230230
# version 1
231231
- do:

x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ protected void masterOperation(AckWatchRequest request, ClusterState state,
108108

109109
UpdateRequest updateRequest = new UpdateRequest(Watch.INDEX, Watch.DOC_TYPE, request.getWatchId());
110110
// this may reject this action, but prevents concurrent updates from a watch execution
111-
if (clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_7_0_0)) {
111+
if (clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_6_7_0)) {
112112
updateRequest.setIfSeqNo(getResponse.getSeqNo());
113113
updateRequest.setIfPrimaryTerm(getResponse.getPrimaryTerm());
114114
} else {

0 commit comments

Comments
 (0)