Merge branch 'main' into 2025/04/07/AbstractBlobContainerRetriesTestCase-createBlobContainer-blobContainerPath

Author: DaveCTurner

docs/changelog/125562.yaml

@@ -0,0 +1,6 @@
+pr: 125562
+summary: Improve handling of empty response
+area: Infra/REST API
+type: bug
+issues:
+ - 57639

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_balance/10_basic.yml

@@ -180,6 +180,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.8.0"]
       reason: "reset API added in in 8.8.0"
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: DELETE
+          path: /_internal/desired_balance
+          capabilities: [ plain_text_empty_response ]
 
   - do:
       _internal.delete_desired_balance: { }

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/10_basic.yml

@@ -3,6 +3,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.13.0"]
       reason: "API added in in 8.1.0 but modified in 8.13 (node_version field removed)"
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: DELETE
+          path: /_internal/desired_nodes
+          capabilities: [ plain_text_empty_response ]
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/11_old_format.yml

@@ -6,6 +6,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.3.0"]
       reason: "API added in in 8.1.0 but modified in 8.3"
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: DELETE
+          path: /_internal/desired_nodes
+          capabilities: [ plain_text_empty_response ]
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.desired_nodes/20_dry_run.yml

@@ -3,6 +3,11 @@ setup:
   - requires:
       cluster_features: ["gte_v8.4.0"]
       reason: "Support for the dry run option was added in in 8.4.0"
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: DELETE
+          path: /_internal/desired_nodes
+          capabilities: [ plain_text_empty_response ]
 ---
 teardown:
   - do:

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic.yml

@@ -1,3 +1,16 @@
+setup:
+  - requires:
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: POST
+          path: /_cluster/voting_config_exclusions
+          capabilities: [ plain_text_empty_response ]
+        - method: DELETE
+          path: /_cluster/voting_config_exclusions
+          capabilities: [ plain_text_empty_response ]
+      reason: needs these capabilities
+
+---
 teardown:
   - do:
       cluster.delete_voting_config_exclusions: {}

server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/VotingConfigurationIT.java

@@ -9,22 +9,24 @@
 package org.elasticsearch.cluster.coordination;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest;
-import org.elasticsearch.action.admin.cluster.configuration.TransportAddVotingConfigExclusionsAction;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.transport.TransportService;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ExecutionException;
 
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasSize;
@@ -38,18 +40,39 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         return Collections.singletonList(MockTransportService.TestPlugin.class);
     }
 
-    public void testAbdicateAfterVotingConfigExclusionAdded() throws ExecutionException, InterruptedException {
+    @Override
+    protected boolean addMockHttpTransport() {
+        return false; // enable HTTP
+    }
+
+    public void testAbdicateAfterVotingConfigExclusionAdded() throws IOException {
         internalCluster().setBootstrapMasterNodeIndex(0);
         internalCluster().startNodes(2);
         final String originalMaster = internalCluster().getMasterName();
+        final var restClient = getRestClient();
 
         logger.info("--> excluding master node {}", originalMaster);
-        client().execute(
-            TransportAddVotingConfigExclusionsAction.TYPE,
-            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, originalMaster)
-        ).get();
+        final var excludeRequest = new Request("POST", "/_cluster/voting_config_exclusions");
+        excludeRequest.addParameter("node_names", originalMaster);
+        assertEmptyResponse(restClient.performRequest(excludeRequest));
+
         clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get();
         assertNotEquals(originalMaster, internalCluster().getMasterName());
+
+        final var clearRequest = new Request("DELETE", "/_cluster/voting_config_exclusions");
+        clearRequest.addParameter("wait_for_removal", "false");
+        assertEmptyResponse(restClient.performRequest(clearRequest));
+
+        assertThat(
+            internalCluster().getInstance(ClusterService.class).state().metadata().coordinationMetadata().getVotingConfigExclusions(),
+            empty()
+        );
+    }
+
+    private void assertEmptyResponse(Response response) throws IOException {
+        assertEquals("text/plain; charset=UTF-8", response.getHeader("content-type"));
+        assertEquals(0, response.getEntity().getContentLength());
+        assertEquals(0, response.getEntity().getContent().readAllBytes().length);
     }
 
     public void testElectsNodeNotInVotingConfiguration() throws Exception {

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

@@ -10,9 +10,10 @@
 package org.elasticsearch.action;
 
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.rest.action.EmptyResponseListener;
 import org.elasticsearch.transport.TransportResponse;
-import org.elasticsearch.xcontent.ToXContentObject;
-import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.XContent;
 
 /**
  * Base class for responses to action requests.
@@ -21,20 +22,23 @@ public abstract class ActionResponse extends TransportResponse {
 
     public ActionResponse() {}
 
-    public static final class Empty extends ActionResponse implements ToXContentObject {
+    /**
+     * A response with no payload. This is deliberately not an implementation of {@link ToXContent} or similar because an empty response
+     * has no valid {@link XContent} representation. Use {@link EmptyResponseListener} to convert this to a valid (plain-text) REST
+     * response instead.
+     */
+    public static final class Empty extends ActionResponse {
+
+        private Empty() { /* singleton */ }
+
         public static final ActionResponse.Empty INSTANCE = new ActionResponse.Empty();
 
         @Override
         public String toString() {
-            return "EmptyActionResponse{}";
+            return "ActionResponse.Empty{}";
         }
 
         @Override
         public void writeTo(StreamOutput out) {}
-
-        @Override
-        public XContentBuilder toXContent(final XContentBuilder builder, final Params params) {
-            return builder;
-        }
     }
 }

server/src/main/java/org/elasticsearch/action/datastreams/autosharding/DataStreamAutoShardingService.java

@@ -313,7 +313,7 @@ public String toString() {
             return Strings.format(
                 "For data stream %s: %s based on [inc/dec cooldowns %s/%s, %d-%d threads, "
                     + "write index %s has all-time/recent/peak loads %g/%g/%g, current shards %d, "
-                    + "using %s value %g for increase gives %d shards%s]",
+                    + "increase calculation gives %d shards using %s load %g for write index%s]",
                 inputs.dataStream,
                 result,
                 inputs.increaseShardsCooldown,
@@ -325,19 +325,19 @@ public String toString() {
                 inputs.writeIndexRecentLoad,
                 inputs.writeIndexPeakLoad,
                 inputs.currentNumberOfWriteIndexShards,
+                increaseCalculation.optimalShardCountForIncrease,
                 inputs.increaseShardsMetric,
                 increaseCalculation.writeIndexLoadForIncrease,
-                increaseCalculation.optimalShardCountForIncrease,
                 decreaseCalculation == null
                     ? ""
                     : Strings.format(
-                        ", and using %s value %g for dec based on %s gives %d shards",
+                        ", decrease calculation gives %d shards using %s load %g for %s",
+                        decreaseCalculation.optimalShardCountForDecrease,
                         inputs.decreaseShardsMetric,
                         decreaseCalculation.maxLoadWithinCooldown.load,
                         decreaseCalculation.maxLoadWithinCooldown.previousIndexWithMaxLoad != null
                             ? decreaseCalculation.maxLoadWithinCooldown.previousIndexWithMaxLoad
-                            : "write index",
-                        decreaseCalculation.optimalShardCountForDecrease
+                            : "write index"
                     )
             );
         }

server/src/main/java/org/elasticsearch/rest/action/EmptyResponseListener.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.rest.action;
+
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.RestStatus;
+
+/**
+ * A listener which converts a successful {@link ActionResponse.Empty} action response into a {@code 200 OK} REST response with empty body.
+ */
+public final class EmptyResponseListener extends RestResponseListener<ActionResponse.Empty> {
+    public EmptyResponseListener(RestChannel channel) {
+        super(channel);
+    }
+
+    @Override
+    public RestResponse buildResponse(ActionResponse.Empty ignored) throws Exception {
+        // Content-type header is not required for an empty body but some clients may expect it; the empty body is a valid text/plain entity
+        // so we use that here.
+        return new RestResponse(RestStatus.OK, RestResponse.TEXT_CONTENT_TYPE, BytesArray.EMPTY);
+    }
+
+    /**
+     * Capability name for APIs that previously would return an invalid zero-byte {@code application/json} response so that the YAML test
+     * runner can avoid those APIs.
+     */
+    public static final String PLAIN_TEXT_EMPTY_RESPONSE_CAPABILITY_NAME = "plain_text_empty_response";
+}