Decoupling transform changes since serverless will depend on these changes, I don't want to have to revert broken transform stuff and affect serverless

Author: prwhelan

server/src/main/java/org/elasticsearch/persistent/PersistentTasksExecutor.java

@@ -59,18 +59,6 @@ public Scope scope() {
 
     public static final Assignment NO_NODE_FOUND = new Assignment(null, "no appropriate nodes found for the assignment");
 
-    /**
-     * Use {@link #getAssignment(PersistentTaskParams, Collection, ClusterState, ProjectId)}.
-     */
-    @Deprecated
-    public PersistentTasksCustomMetadata.Assignment getAssignment(
-        Params params,
-        Collection<DiscoveryNode> candidateNodes,
-        ClusterState clusterState
-    ) {
-        return getAssignment(params, candidateNodes, clusterState, null);
-    }
-
     /**
      * Returns the node id where the params has to be executed,
      * <p>

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformMetadata.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.cluster.NamedDiff;
 import org.elasticsearch.cluster.metadata.Metadata;
-import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Iterators;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -210,9 +209,6 @@ public TransformMetadata build() {
         }
     }
 
-    /**
-     * @deprecated use {@link #transformMetadata(ClusterState, ProjectId)}
-     */
     @Deprecated(forRemoval = true)
     public static TransformMetadata getTransformMetadata(ClusterState state) {
         TransformMetadata TransformMetadata = (state == null) ? null : state.metadata().getSingleProjectCustom(TYPE);
@@ -222,17 +218,6 @@ public static TransformMetadata getTransformMetadata(ClusterState state) {
         return TransformMetadata;
     }
 
-    public static TransformMetadata transformMetadata(@Nullable ClusterState state, @Nullable ProjectId projectId) {
-        if (state == null || projectId == null) {
-            return EMPTY_METADATA;
-        }
-        TransformMetadata transformMetadata = state.metadata().getProject(projectId).custom(TYPE);
-        if (transformMetadata == null) {
-            return EMPTY_METADATA;
-        }
-        return transformMetadata;
-    }
-
     public static boolean upgradeMode(ClusterState state) {
         return getTransformMetadata(state).upgradeMode();
     }

x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleShardPersistentTaskExecutorTests.java

@@ -167,7 +167,7 @@ public void testGetStatelessAssignment() {
             Strings.EMPTY_ARRAY,
             Strings.EMPTY_ARRAY
         );
-        var result = executor.getAssignment(params, Set.of(indexNode, searchNode), clusterState);
+        var result = executor.getAssignment(params, Set.of(indexNode, searchNode), clusterState, null);
         assertThat(result.getExecutorNode(), nullValue());
 
         // Assign a copy of the shard to a search node
@@ -187,7 +187,7 @@ public void testGetStatelessAssignment() {
                     .build()
             )
             .build();
-        result = executor.getAssignment(params, Set.of(indexNode, searchNode), clusterState);
+        result = executor.getAssignment(params, Set.of(indexNode, searchNode), clusterState, null);
         assertThat(result.getExecutorNode(), equalTo(searchNode.getId()));
     }
 

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java

@@ -127,14 +127,14 @@ public PersistentTasksCustomMetadata.Assignment getAssignment(
          *
          * Operations on the transform node happen in {@link #nodeOperation()}
          */
-        var transformMetadata = TransformMetadata.transformMetadata(clusterState, projectId);
+        var transformMetadata = TransformMetadata.getTransformMetadata(clusterState);
         if (transformMetadata.upgradeMode()) {
             return AWAITING_UPGRADE;
         }
         if (transformMetadata.resetMode()) {
             return RESET_IN_PROGRESS;
         }
-        List<String> unavailableIndices = verifyIndicesPrimaryShardsAreActive(clusterState, resolver, projectId);
+        List<String> unavailableIndices = verifyIndicesPrimaryShardsAreActive(clusterState, resolver);
         if (unavailableIndices.size() != 0) {
             String reason = "Not starting transform ["
                 + params.getId()
@@ -180,17 +180,7 @@ public PersistentTasksCustomMetadata.Assignment getAssignment(
         return new PersistentTasksCustomMetadata.Assignment(discoveryNode.getId(), "");
     }
 
-    static List<String> verifyIndicesPrimaryShardsAreActive(
-        ClusterState clusterState,
-        IndexNameExpressionResolver resolver,
-        @Nullable ProjectId projectId
-    ) {
-        // if the projectId doesn't exist, we will get an empty routing table which will have no indices
-        if (projectId == null) {
-            return List.of();
-        }
-
-        var projectRoutingTable = clusterState.routingTable(projectId);
+    static List<String> verifyIndicesPrimaryShardsAreActive(ClusterState clusterState, IndexNameExpressionResolver resolver) {
         String[] indices = resolver.concreteIndexNames(
             clusterState,
             IndicesOptions.lenientExpandOpen(),
@@ -199,7 +189,7 @@ static List<String> verifyIndicesPrimaryShardsAreActive(
         );
         List<String> unavailableIndices = new ArrayList<>(indices.length);
         for (String index : indices) {
-            IndexRoutingTable routingTable = projectRoutingTable.index(index);
+            IndexRoutingTable routingTable = clusterState.getRoutingTable().index(index);
             if (routingTable == null || routingTable.allPrimaryShardsActive() == false || routingTable.readyForSearch() == false) {
                 unavailableIndices.add(index);
             }

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/TransformMetadataTests.java

@@ -7,17 +7,11 @@
 
 package org.elasticsearch.xpack.transform;
 
-import org.elasticsearch.cluster.ClusterName;
-import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.metadata.Metadata;
-import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractChunkedSerializingTestCase;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.transform.TransformMetadata;
 
-import static org.hamcrest.Matchers.equalTo;
-
 public class TransformMetadataTests extends AbstractChunkedSerializingTestCase<TransformMetadata> {
 
     @Override
@@ -41,39 +35,4 @@ protected TransformMetadata mutateInstance(TransformMetadata instance) {
             .upgradeMode(instance.upgradeMode() == false)
             .build();
     }
-
-    public void testTransformMetadataFromClusterState() {
-        var expectedTransformMetadata = new TransformMetadata.Builder().resetMode(true).upgradeMode(true).build();
-        var projectId = randomUniqueProjectId();
-        var clusterState = ClusterState.builder(new ClusterName("_name"))
-            .metadata(
-                Metadata.builder().put(ProjectMetadata.builder(projectId).putCustom(TransformMetadata.TYPE, expectedTransformMetadata))
-            )
-            .build();
-
-        assertThat(TransformMetadata.transformMetadata(clusterState, projectId), equalTo(expectedTransformMetadata));
-        assertThat(TransformMetadata.getTransformMetadata(clusterState), equalTo(expectedTransformMetadata));
-    }
-
-    public void testTransformMetadataFromMissingClusterState() {
-        assertThat(TransformMetadata.transformMetadata(null, randomUniqueProjectId()), equalTo(TransformMetadata.EMPTY_METADATA));
-        assertThat(TransformMetadata.getTransformMetadata(null), equalTo(TransformMetadata.EMPTY_METADATA));
-    }
-
-    public void testTransformMetadataFromMissingProjectId() {
-        assertThat(
-            TransformMetadata.transformMetadata(ClusterState.builder(new ClusterName("_name")).build(), null),
-            equalTo(TransformMetadata.EMPTY_METADATA)
-        );
-    }
-
-    public void testTransformMetadataWhenAbsentFromClusterState() {
-        var projectId = randomUniqueProjectId();
-        var clusterState = ClusterState.builder(new ClusterName("_name"))
-            .metadata(Metadata.builder().put(ProjectMetadata.builder(projectId)))
-            .build();
-
-        assertThat(TransformMetadata.transformMetadata(clusterState, projectId), equalTo(TransformMetadata.EMPTY_METADATA));
-        assertThat(TransformMetadata.getTransformMetadata(clusterState), equalTo(TransformMetadata.EMPTY_METADATA));
-    }
 }

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java

@@ -335,10 +335,7 @@ public void testVerifyIndicesPrimaryShardsAreActive() {
         csBuilder.metadata(metadata);
 
         ClusterState cs = csBuilder.build();
-        assertEquals(
-            0,
-            TransformPersistentTasksExecutor.verifyIndicesPrimaryShardsAreActive(cs, indexNameExpressionResolver(), projectId).size()
-        );
+        assertEquals(0, TransformPersistentTasksExecutor.verifyIndicesPrimaryShardsAreActive(cs, indexNameExpressionResolver()).size());
 
         metadata = Metadata.builder(cs.metadata());
         routingTable = new RoutingTable.Builder(cs.routingTable(projectId));
@@ -366,8 +363,7 @@ public void testVerifyIndicesPrimaryShardsAreActive() {
         csBuilder.metadata(metadata);
         List<String> result = TransformPersistentTasksExecutor.verifyIndicesPrimaryShardsAreActive(
             csBuilder.build(),
-            indexNameExpressionResolver(),
-            projectId
+            indexNameExpressionResolver()
         );
         assertEquals(1, result.size());
         assertEquals(indexToRemove, result.get(0));