diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml index c70942f0c9d91..b944fe43791e4 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml @@ -51,9 +51,6 @@ setup: --- "Verify created repository": - - skip: - version: "all" - reason: AwaitsFix for https://github.com/elastic/elasticsearch/issues/30807 - do: snapshot.verify_repository: repository: test_repo_get_2 diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java index 3bd2bef12748c..4614085f26e2b 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java @@ -73,7 +73,7 @@ public void onResponse(RepositoriesService.VerifyResponse verifyResponse) { if (verifyResponse.failed()) { listener.onFailure(new RepositoryVerificationException(request.name(), verifyResponse.failureDescription())); } else { - listener.onResponse(new VerifyRepositoryResponse(clusterService.getClusterName(), verifyResponse.nodes())); + listener.onResponse(new VerifyRepositoryResponse(verifyResponse.nodes())); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java index f8f1c055c7beb..41835d3e11255 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryResponse.java @@ -19,16 +19,13 @@ package org.elasticsearch.action.admin.cluster.repositories.verify; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionResponse; -import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; -import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -36,7 +33,6 @@ import java.io.IOException; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -92,20 +88,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return builder; } - /** - * Temporary method that allows turning a {@link NodeView} into a {@link DiscoveryNode}. This representation will never be used in - * practice, because in >= 6.4 a consumer of the response will only be able to retrieve a representation of {@link NodeView} - * objects. - * - * Effectively this will be used to hold the state of the object in 6.x so there is no need to have 2 backing objects that - * represent the state of the Response. In practice these will always be read by a consumer as a NodeView, but it eases the - * transition to master which will not contain any representation of a {@link DiscoveryNode}. - */ - DiscoveryNode convertToDiscoveryNode() { - return new DiscoveryNode(name, nodeId, "", "", "", new TransportAddress(TransportAddress.META_ADDRESS, 0), - Collections.emptyMap(), Collections.emptySet(), Version.CURRENT); - } - @Override public boolean equals(Object obj) { if (obj == null) { @@ -125,10 +107,7 @@ public int hashCode() { } } - private List nodes; - - private ClusterName clusterName; - + private List nodes; private static final ObjectParser PARSER = new ObjectParser<>(VerifyRepositoryResponse.class.getName(), VerifyRepositoryResponse::new); @@ -139,43 +118,28 @@ public int hashCode() { VerifyRepositoryResponse() { } - public VerifyRepositoryResponse(ClusterName clusterName, DiscoveryNode[] nodes) { - this.clusterName = clusterName; - this.nodes = Arrays.asList(nodes); + public VerifyRepositoryResponse(DiscoveryNode[] nodes) { + this.nodes = Arrays.stream(nodes).map(dn -> new NodeView(dn.getId(), dn.getName())).collect(Collectors.toList()); } @Override public void readFrom(StreamInput in) throws IOException { super.readFrom(in); - if (in.getVersion().onOrAfter(Version.V_6_4_0)) { - this.nodes = in.readList(NodeView::new).stream().map(n -> n.convertToDiscoveryNode()).collect(Collectors.toList()); - } else { - clusterName = new ClusterName(in); - this.nodes = in.readList(DiscoveryNode::new); - } + this.nodes = in.readList(NodeView::new); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_6_4_0)) { - out.writeList(getNodes()); - } else { - clusterName.writeTo(out); - out.writeList(nodes); - } + out.writeList(nodes); } public List getNodes() { - return nodes.stream().map(dn -> new NodeView(dn.getId(), dn.getName())).collect(Collectors.toList()); - } - - public ClusterName getClusterName() { - return clusterName; + return nodes; } protected void setNodes(List nodes) { - this.nodes = nodes.stream().map(n -> n.convertToDiscoveryNode()).collect(Collectors.toList()); + this.nodes = nodes; } @Override @@ -184,12 +148,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws { builder.startObject(NODES); { - for (DiscoveryNode node : nodes) { - builder.startObject(node.getId()); - { - builder.field(NAME, node.getName()); - } - builder.endObject(); + for (NodeView node : nodes) { + node.toXContent(builder, params); } } builder.endObject(); diff --git a/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java index 23cb579bfdc92..d39d33b9d3e5e 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java +++ b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesIT.java @@ -40,7 +40,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue;