Adapt minimum versions for seq# power operations

After backporting elastic#37977, elastic#37857 and elastic#37872
bleskes · Feb 1, 2019 · 748c13e · 748c13e
1 parent 54bbb72
commit 748c13e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_if_seq_no.yml
@@ -2,8 +2,8 @@
 "Update with if_seq_no":
 
  - skip:
-      version: " - 6.99.99"
-      reason: if_seq_no was added in 7.0
+      version: " - 6.6.99"
+      reason: if_seq_no was added in 6.7.0
 
  - do:
       catch:        missing

diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java b/server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
@@ -912,7 +912,7 @@ public void readFrom(StreamInput in) throws IOException {
         docAsUpsert = in.readBoolean();
         version = in.readLong();
         versionType = VersionType.fromValue(in.readByte());
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             ifSeqNo = in.readZLong();
             ifPrimaryTerm = in.readVLong();
         }
@@ -960,7 +960,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(docAsUpsert);
         out.writeLong(version);
         out.writeByte(versionType.getValue());
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeZLong(ifSeqNo);
             out.writeVLong(ifPrimaryTerm);
         }

diff --git a/...k/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java b/...k/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java
@@ -207,7 +207,7 @@ public void readFrom(StreamInput in) throws IOException {
         } else {
             version = Versions.MATCH_ANY;
         }
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             ifSeqNo = in.readZLong();
             ifPrimaryTerm = in.readVLong();
         } else {
@@ -228,7 +228,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
             out.writeZLong(version);
         }
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeZLong(ifSeqNo);
             out.writeVLong(ifPrimaryTerm);
         }

diff --git a/.../plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchResponse.java b/.../plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchResponse.java
@@ -110,7 +110,7 @@ public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeString(id);
         out.writeVLong(version);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
             out.writeZLong(seqNo);
             out.writeVLong(primaryTerm);
         }
@@ -122,7 +122,7 @@ public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         id = in.readString();
         version = in.readVLong();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
             seqNo = in.readZLong();
             primaryTerm = in.readVLong();
         } else {

diff --git a/...ain/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchResponse.java b/...ain/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchResponse.java
@@ -100,7 +100,7 @@ public void readFrom(StreamInput in) throws IOException {
             } else {
                 version = Versions.MATCH_ANY;
             }
-            if (in.getVersion().onOrAfter(Version.V_7_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_6_7_0)) {
                 seqNo = in.readZLong();
                 primaryTerm = in.readVLong();
             }
@@ -124,7 +124,7 @@ public void writeTo(StreamOutput out) throws IOException {
             if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
                 out.writeZLong(version);
             }
-            if (out.getVersion().onOrAfter(Version.V_7_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_6_7_0)) {
                 out.writeZLong(seqNo);
                 out.writeVLong(primaryTerm);
             }

diff --git a/...c/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml b/...c/test/resources/rest-api-spec/test/watcher/put_watch/80_put_get_watch_with_passwords.yml
@@ -224,8 +224,8 @@ setup:
 ---
 "Test putting a watch with a redacted password with old seq no returns an error":
   - skip:
-      version: " - 6.99.99"
-      reason:  seq no powered concurrency was added in 7.0.0
+      version: " - 6.6.99"
+      reason:  seq no powered concurrency was added in 6.7.0
 
   # version 1
   - do:

diff --git a/...n/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java b/...n/java/org/elasticsearch/xpack/watcher/transport/actions/ack/TransportAckWatchAction.java
@@ -108,7 +108,7 @@ protected void masterOperation(AckWatchRequest request, ClusterState state,
 
                             UpdateRequest updateRequest = new UpdateRequest(Watch.INDEX, Watch.DOC_TYPE, request.getWatchId());
                             // this may reject this action, but prevents concurrent updates from a watch execution
-                            if (clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_7_0_0)) {
+                            if (clusterService.state().nodes().getMinNodeVersion().onOrAfter(Version.V_6_7_0)) {
                                 updateRequest.setIfSeqNo(getResponse.getSeqNo());
                                 updateRequest.setIfPrimaryTerm(getResponse.getPrimaryTerm());
                             } else {