Jack reset this commit

Author: JVerwolf

qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TVBackportRollingUpgradeIT.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.upgrades;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import org.apache.logging.log4j.Logger;
+
+public class TVBackportRollingUpgradeIT extends AbstractRollingUpgradeTestCase {
+
+    public TVBackportRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
+        super(upgradedNodes);
+    }
+    // We'd be most interested to see this failing on the patch issue where 9.0 thinks it's ahead of 8.x but it's not.
+    /*
+        v2  TV1,TV3,
+        v3  TV1,TV2,TV3,TV4
+
+     */
+    public void testTVBackport() {
+        if (isOldCluster()) {
+            // TODO: Implement the test for old cluster
+        } else if (isMixedCluster()) {
+            // TODO: Test mixed cluster behavior
+        } else if (isUpgradedCluster()) {
+            // TODO: Test upgraded cluster behavior
+        } else {
+            fail("Unknown cluster state");
+        }
+    }
+}

server/src/main/java/org/elasticsearch/TVAssociations.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch;
+
+import java.util.List;
+
+public abstract class TVAssociations {
+    public final List<TransportVersion> TVs;
+
+    public TVAssociations(List<TransportVersion> TVs) {
+        if (TVs.isEmpty()) {
+            throw new IllegalArgumentException("TVAssociations must have at least one TransportVersion");
+        }
+        this.TVs = TVs;
+        // TODO filter out versions we don't know about.
+
+    }
+
+    public boolean isCompatable(TransportVersion version) {
+        return version.onOrAfter(TVs.getFirst()) ; // TODO
+    }
+
+
+}

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -29,6 +29,13 @@
  */
 public class TransportVersions {
 
+
+    static final List<TransportVersion> ALL_VERSIONS = new ArrayList<>();
+
+    public static void register(TVAssociations version) {
+//        ALL_VERSIONS.add(version);
+    }
+
     /*
      * NOTE: IntelliJ lies!
      * This map is used during class construction, referenced by the registerTransportVersion method.

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -210,6 +210,9 @@
 import org.elasticsearch.action.termvectors.TransportMultiTermVectorsAction;
 import org.elasticsearch.action.termvectors.TransportShardMultiTermsVectorAction;
 import org.elasticsearch.action.termvectors.TransportTermVectorsAction;
+import org.elasticsearch.action.tvbackport.RestTVBackportAction;
+import org.elasticsearch.action.tvbackport.TVBackportAction;
+import org.elasticsearch.action.tvbackport.TransportTVBackportAction;
 import org.elasticsearch.action.update.TransportUpdateAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
@@ -809,6 +812,9 @@ public <Request extends ActionRequest, Response extends ActionResponse> void reg
         actions.register(GetSynonymRuleAction.INSTANCE, TransportGetSynonymRuleAction.class);
         actions.register(DeleteSynonymRuleAction.INSTANCE, TransportDeleteSynonymRuleAction.class);
 
+        // Transport Version Backport Testing
+        actions.register(TVBackportAction.INSTANCE, TransportTVBackportAction.class);
+
         return unmodifiableMap(actions.getRegistry());
     }
 
@@ -1036,6 +1042,9 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster, Predicate<
         registerHandler.accept(new RestPutSynonymRuleAction());
         registerHandler.accept(new RestGetSynonymRuleAction());
         registerHandler.accept(new RestDeleteSynonymRuleAction());
+
+        // Transport Version Backport Testing
+        registerHandler.accept(new RestTVBackportAction());
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/tvbackport/RestTVBackportAction.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.action.tvbackport;
+
+import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.rest.BaseRestHandler;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.action.RestToXContentListener;
+
+import java.io.IOException;
+import java.util.List;
+
+public class RestTVBackportAction extends BaseRestHandler {
+    @Override
+    public String getName() {
+        return "_tv_backport_action";
+    }
+
+    @Override
+    public List<Route> routes() {
+        return List.of(new Route(RestRequest.Method.GET, "/_tv_backport"));
+    }
+
+    @Override
+    protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+        TVBackportRequest tvBackportRequest = new TVBackportRequest();
+        // Here you can set any parameters from the request to the tvBackportRequest if needed
+        return channel -> client.execute(TVBackportAction.INSTANCE, tvBackportRequest, new RestToXContentListener<>(channel));
+    }
+}

server/src/main/java/org/elasticsearch/action/tvbackport/TVBackportAction.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.action.tvbackport;
+
+import org.elasticsearch.action.ActionType;
+
+public class TVBackportAction extends ActionType<TVBackportResponse> {
+    public static final TVBackportAction INSTANCE = new TVBackportAction();
+    public static final String NAME = "cluster:monitor/tvbackport";
+
+    private TVBackportAction() {
+        super(NAME);
+    }
+}

server/src/main/java/org/elasticsearch/action/tvbackport/TVBackportRequest.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.action.tvbackport;
+
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+
+public class TVBackportRequest extends ActionRequest {
+
+    @Override
+    public ActionRequestValidationException validate() {
+        return null;
+    }
+}

server/src/main/java/org/elasticsearch/action/tvbackport/TVBackportResponse.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.action.tvbackport;
+
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.versions.TestTV;
+import org.elasticsearch.xcontent.ToXContentObject;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+
+public class TVBackportResponse extends ActionResponse implements ToXContentObject {
+    String message;
+
+    public TVBackportResponse(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        if (TestTV.INSTANCE.isCompatable(out.getTransportVersion()) {
+            out.writeString("TestTV");
+        }
+        out.writeString(message);
+
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        builder.field("message", message);
+        builder.endObject();
+        return builder;
+    }
+}

server/src/main/java/org/elasticsearch/action/tvbackport/TransportTVBackportAction.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+package org.elasticsearch.action.tvbackport;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.TransportAction;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.injection.guice.Inject;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.transport.TransportService;
+
+public class TransportTVBackportAction extends TransportAction<TVBackportRequest, TVBackportResponse> {
+    private static final Logger logger = LogManager.getLogger(TransportTVBackportAction.class);
+
+    @Inject
+    public TransportTVBackportAction(
+        ActionFilters actionFilters,
+        TransportService transportService
+    ) {
+        super(TVBackportAction.NAME, actionFilters, transportService.getTaskManager(), EsExecutors.DIRECT_EXECUTOR_SERVICE);
+    }
+
+    @Override
+    protected void doExecute(Task task, TVBackportRequest request, ActionListener<TVBackportResponse> listener) {
+        logger.info("Executing TVBackportAction for request");
+        listener.onResponse(new TVBackportResponse("This is a TV Backport response"));
+    }
+}

server/src/main/java/org/elasticsearch/common/VersionId.java

@@ -16,7 +16,7 @@ public interface VersionId<T extends VersionId<T>> extends Comparable<T> {
     /**
      * The version id this object represents
      */
-    int id();
+    int[] id();
 
     default boolean after(T version) {
         return version.id() < id();