From 3a4b3fbe7214158d51c03f149ec6d86af2d7a88f Mon Sep 17 00:00:00 2001 From: Michael Froh Date: Wed, 12 Apr 2023 23:56:29 +0000 Subject: [PATCH] [SearchPipelines] Lower compatibility version to 2.7 The search pipelines code should be available starting in OpenSearch 2.7, so compatibility checks should start from that version. Signed-off-by: Michael Froh --- .../src/main/java/org/opensearch/OpenSearchException.java | 8 ++------ .../action/admin/cluster/node/info/NodeInfo.java | 4 ++-- .../java/org/opensearch/action/search/SearchRequest.java | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java index 2d94428a35140..35881e1804f0f 100644 --- a/server/src/main/java/org/opensearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -76,6 +76,7 @@ import static org.opensearch.Version.V_2_4_0; import static org.opensearch.Version.V_2_5_0; import static org.opensearch.Version.V_2_6_0; +import static org.opensearch.Version.V_2_7_0; import static org.opensearch.Version.V_3_0_0; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_UUID_NA_VALUE; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -1643,12 +1644,7 @@ private enum OpenSearchExceptionHandle { V_2_6_0 ), NODE_WEIGHED_AWAY_EXCEPTION(NodeWeighedAwayException.class, NodeWeighedAwayException::new, 169, V_2_6_0), - SEARCH_PIPELINE_PROCESSING_EXCEPTION( - SearchPipelineProcessingException.class, - SearchPipelineProcessingException::new, - 170, - V_3_0_0 // TODO: Update if/when we backport to 2.x - ), + SEARCH_PIPELINE_PROCESSING_EXCEPTION(SearchPipelineProcessingException.class, SearchPipelineProcessingException::new, 170, V_2_7_0), INDEX_CREATE_BLOCK_EXCEPTION( org.opensearch.cluster.block.IndexCreateBlockException.class, org.opensearch.cluster.block.IndexCreateBlockException::new, diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java index af4e27012f631..4e83b1356ff43 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java @@ -100,7 +100,7 @@ public NodeInfo(StreamInput in) throws IOException { addInfoIfNonNull(PluginsAndModules.class, in.readOptionalWriteable(PluginsAndModules::new)); addInfoIfNonNull(IngestInfo.class, in.readOptionalWriteable(IngestInfo::new)); addInfoIfNonNull(AggregationInfo.class, in.readOptionalWriteable(AggregationInfo::new)); - if (in.getVersion().onOrAfter(Version.V_3_0_0)) { // TODO: Change if/when we backport to 2.x + if (in.getVersion().onOrAfter(Version.V_2_7_0)) { addInfoIfNonNull(SearchPipelineInfo.class, in.readOptionalWriteable(SearchPipelineInfo::new)); } } @@ -224,7 +224,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalWriteable(getInfo(PluginsAndModules.class)); out.writeOptionalWriteable(getInfo(IngestInfo.class)); out.writeOptionalWriteable(getInfo(AggregationInfo.class)); - if (out.getVersion().onOrAfter(Version.V_3_0_0)) { // TODO: Change if/when we backport to 2.x + if (out.getVersion().onOrAfter(Version.V_2_7_0)) { out.writeOptionalWriteable(getInfo(SearchPipelineInfo.class)); } } diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java index 73e8b56c0db9d..b16f5613ec895 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/opensearch/action/search/SearchRequest.java @@ -250,7 +250,7 @@ public SearchRequest(StreamInput in) throws IOException { } ccsMinimizeRoundtrips = in.readBoolean(); cancelAfterTimeInterval = in.readOptionalTimeValue(); - if (in.getVersion().onOrAfter(Version.V_3_0_0)) { // TODO: Update if/when we backport to 2.x + if (in.getVersion().onOrAfter(Version.V_2_7_0)) { pipeline = in.readOptionalString(); } } @@ -281,7 +281,7 @@ public void writeTo(StreamOutput out) throws IOException { } out.writeBoolean(ccsMinimizeRoundtrips); out.writeOptionalTimeValue(cancelAfterTimeInterval); - if (out.getVersion().onOrAfter(Version.V_3_0_0)) { // TODO: Update if/when we backport to 2.x + if (out.getVersion().onOrAfter(Version.V_2_7_0)) { out.writeOptionalString(pipeline); } }