Adjust wire version for search context id

Relates #53143
elastic · Mar 11, 2020 · cd6d0b7 · cd6d0b7
1 parent 7ba94d8
commit cd6d0b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java
@@ -108,7 +108,7 @@ private void innerRun() throws IOException {
         final List<SearchPhaseResult> phaseResults = queryResults.asList();
         final String scrollId;
         if (isScrollSearch) {
-            final boolean includeContextUUID = clusterState.nodes().getMinNodeVersion().onOrAfter(Version.V_8_0_0);
+            final boolean includeContextUUID = clusterState.nodes().getMinNodeVersion().onOrAfter(Version.V_7_7_0);
             scrollId = TransportSearchHelper.buildScrollId(queryResults, includeContextUUID);
         } else {
             scrollId = null;

diff --git a/server/src/main/java/org/elasticsearch/search/internal/SearchContextId.java b/server/src/main/java/org/elasticsearch/search/internal/SearchContextId.java
@@ -39,7 +39,7 @@ public SearchContextId(String readerId, long id) {
 
     public SearchContextId(StreamInput in) throws IOException {
         this.id = in.readLong();
-        if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
             this.readerId = in.readString();
         } else {
             this.readerId = "";
@@ -49,7 +49,7 @@ public SearchContextId(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeLong(id);
-        if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
             out.writeString(readerId);
         }
     }

diff --git a/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
@@ -357,7 +357,7 @@ public void testSearchContextMissingException() throws IOException {
         Version version = VersionUtils.randomVersion(random());
         SearchContextMissingException ex = serialize(new SearchContextMissingException(contextId), version);
         assertThat(ex.contextId().getId(), equalTo(contextId.getId()));
-        if (version.onOrAfter(Version.V_8_0_0)) {
+        if (version.onOrAfter(Version.V_7_7_0)) {
             assertThat(ex.contextId().getReaderId(), equalTo(contextId.getReaderId()));
         } else {
             assertThat(ex.contextId().getReaderId(), equalTo(""));