Skip to content

Commit 41f09fb

Browse files
joegallojoegallo
authored
Drop HLRC from this test (#101681)
1 parent 2d144ba commit 41f09fb

File tree

2 files changed

+78
-77
lines changed

2 files changed

+78
-77
lines changed

‎qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/AbstractMultiClusterRemoteTestCase.java

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.elasticsearch.ElasticsearchException;
1212
import org.elasticsearch.client.Request;
1313
import org.elasticsearch.client.RestClient;
14-
import org.elasticsearch.client.RestHighLevelClient;
1514
import org.elasticsearch.common.settings.SecureString;
1615
import org.elasticsearch.common.settings.Settings;
1716
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -26,10 +25,8 @@
2625
import java.net.URISyntaxException;
2726
import java.nio.file.Files;
2827
import java.nio.file.Path;
29-
import java.util.Collections;
3028
import java.util.function.Consumer;
3129

32-
@SuppressWarnings("removal")
3330
public abstract class AbstractMultiClusterRemoteTestCase extends ESRestTestCase {
3431

3532
private static final String USER = "x_pack_rest_user";
@@ -40,8 +37,8 @@ protected boolean preserveClusterUponCompletion() {
4037
return true;
4138
}
4239

43-
private static RestHighLevelClient cluster1Client;
44-
private static RestHighLevelClient cluster2Client;
40+
private static RestClient cluster1Client;
41+
private static RestClient cluster2Client;
4542
private static boolean initialized = false;
4643

4744
@Override
@@ -62,8 +59,8 @@ public void initClientsAndConfigureClusters() throws Exception {
6259
request.addParameter("wait_for_status", "yellow");
6360
request.addParameter("wait_for_nodes", "1");
6461
};
65-
ensureHealth(cluster1Client().getLowLevelClient(), waitForYellowRequest);
66-
ensureHealth(cluster2Client().getLowLevelClient(), waitForYellowRequest);
62+
ensureHealth(cluster1Client, waitForYellowRequest);
63+
ensureHealth(cluster2Client, waitForYellowRequest);
6764

6865
initialized = true;
6966
}
@@ -86,28 +83,22 @@ public static void destroyClients() throws IOException {
8683
}
8784
}
8885

89-
protected static RestHighLevelClient cluster1Client() {
86+
protected static RestClient cluster1Client() {
9087
return cluster1Client;
9188
}
9289

93-
protected static RestHighLevelClient cluster2Client() {
90+
protected static RestClient cluster2Client() {
9491
return cluster2Client;
9592
}
9693

97-
private static class HighLevelClient extends RestHighLevelClient {
98-
private HighLevelClient(RestClient restClient) {
99-
super(restClient, RestClient::close, Collections.emptyList());
100-
}
101-
}
102-
103-
private RestHighLevelClient buildClient(final String url) throws IOException {
94+
private RestClient buildClient(final String url) throws IOException {
10495
int portSeparator = url.lastIndexOf(':');
10596
HttpHost httpHost = new HttpHost(
10697
url.substring(0, portSeparator),
10798
Integer.parseInt(url.substring(portSeparator + 1)),
10899
getProtocol()
109100
);
110-
return new HighLevelClient(buildClient(restAdminSettings(), new HttpHost[] { httpHost }));
101+
return buildClient(restAdminSettings(), new HttpHost[] { httpHost });
111102
}
112103

113104
protected boolean isOss() {

‎qa/remote-clusters/src/test/java/org/elasticsearch/cluster/remote/test/RemoteClustersIT.java

Lines changed: 70 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
*/
88
package org.elasticsearch.cluster.remote.test;
99

10-
import org.elasticsearch.action.index.IndexRequest;
11-
import org.elasticsearch.action.search.SearchRequest;
12-
import org.elasticsearch.action.support.WriteRequest;
13-
import org.elasticsearch.client.RequestOptions;
10+
import org.elasticsearch.client.Request;
1411
import org.elasticsearch.client.RestClient;
1512
import org.elasticsearch.common.settings.Settings;
16-
import org.elasticsearch.xcontent.XContentFactory;
13+
import org.elasticsearch.test.rest.ObjectPath;
1714
import org.junit.After;
1815
import org.junit.Before;
1916

@@ -28,44 +25,53 @@ public class RemoteClustersIT extends AbstractMultiClusterRemoteTestCase {
2825

2926
@Before
3027
public void setupIndices() throws IOException {
31-
RestClient cluster1Client = cluster1Client().getLowLevelClient();
32-
assertTrue(createIndex(cluster1Client, "test1", Settings.builder().put("index.number_of_replicas", 0).build()).isAcknowledged());
33-
cluster1Client().index(
34-
new IndexRequest("test1").id("id1")
35-
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
36-
.source(XContentFactory.jsonBuilder().startObject().field("foo", "bar").endObject()),
37-
RequestOptions.DEFAULT
38-
);
39-
40-
RestClient cluster2Client = cluster2Client().getLowLevelClient();
41-
assertTrue(createIndex(cluster2Client, "test2", Settings.builder().put("index.number_of_replicas", 0).build()).isAcknowledged());
42-
cluster2Client().index(
43-
new IndexRequest("test2").id("id1").source(XContentFactory.jsonBuilder().startObject().field("foo", "bar").endObject()),
44-
RequestOptions.DEFAULT
45-
);
46-
cluster2Client().index(
47-
new IndexRequest("test2").id("id2")
48-
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
49-
.source(XContentFactory.jsonBuilder().startObject().field("foo", "bar").endObject()),
50-
RequestOptions.DEFAULT
51-
);
52-
assertEquals(1L, cluster1Client().search(new SearchRequest("test1"), RequestOptions.DEFAULT).getHits().getTotalHits().value);
53-
assertEquals(2L, cluster2Client().search(new SearchRequest("test2"), RequestOptions.DEFAULT).getHits().getTotalHits().value);
28+
assertTrue(createIndex(cluster1Client(), "test1", Settings.builder().put("index.number_of_replicas", 0).build()).isAcknowledged());
29+
{
30+
Request createDoc = new Request("POST", "/test1/_doc/id1?refresh=true");
31+
createDoc.setJsonEntity("""
32+
{ "foo": "bar" }
33+
""");
34+
assertOK(cluster1Client().performRequest(createDoc));
35+
}
36+
{
37+
Request searchRequest = new Request("POST", "/test1/_search");
38+
ObjectPath doc = ObjectPath.createFromResponse(cluster1Client().performRequest(searchRequest));
39+
assertEquals(1, (int) doc.evaluate("hits.total.value"));
40+
}
41+
42+
assertTrue(createIndex(cluster2Client(), "test2", Settings.builder().put("index.number_of_replicas", 0).build()).isAcknowledged());
43+
{
44+
Request createDoc = new Request("POST", "/test2/_doc/id1?refresh=true");
45+
createDoc.setJsonEntity("""
46+
{ "foo": "bar" }
47+
""");
48+
assertOK(cluster2Client().performRequest(createDoc));
49+
}
50+
{
51+
Request createDoc = new Request("POST", "/test2/_doc/id2?refresh=true");
52+
createDoc.setJsonEntity("""
53+
{ "foo": "bar" }
54+
""");
55+
assertOK(cluster2Client().performRequest(createDoc));
56+
}
57+
{
58+
Request searchRequest = new Request("POST", "/test2/_search");
59+
ObjectPath doc = ObjectPath.createFromResponse(cluster2Client().performRequest(searchRequest));
60+
assertEquals(2, (int) doc.evaluate("hits.total.value"));
61+
}
5462
}
5563

5664
@After
5765
public void clearIndices() throws IOException {
58-
RestClient cluster1Client = cluster1Client().getLowLevelClient();
59-
assertTrue(deleteIndex(cluster1Client, "*").isAcknowledged());
60-
RestClient cluster2Client = cluster2Client().getLowLevelClient();
61-
assertTrue(deleteIndex(cluster2Client, "*").isAcknowledged());
66+
assertTrue(deleteIndex(cluster1Client(), "*").isAcknowledged());
67+
assertTrue(deleteIndex(cluster2Client(), "*").isAcknowledged());
6268
}
6369

6470
@After
6571
public void clearRemoteClusterSettings() throws IOException {
6672
Settings setting = Settings.builder().putNull("cluster.remote.*").build();
67-
updateClusterSettings(cluster1Client().getLowLevelClient(), setting);
68-
updateClusterSettings(cluster2Client().getLowLevelClient(), setting);
73+
updateClusterSettings(cluster1Client(), setting);
74+
updateClusterSettings(cluster2Client(), setting);
6975
}
7076

7177
public void testProxyModeConnectionWorks() throws IOException {
@@ -76,14 +82,15 @@ public void testProxyModeConnectionWorks() throws IOException {
7682
.put("cluster.remote.cluster2.proxy_address", cluster2RemoteClusterSeed)
7783
.build();
7884

79-
updateClusterSettings(cluster1Client().getLowLevelClient(), settings);
85+
updateClusterSettings(cluster1Client(), settings);
8086

81-
assertTrue(isConnected(cluster1Client().getLowLevelClient()));
87+
assertTrue(isConnected(cluster1Client()));
8288

83-
assertEquals(
84-
2L,
85-
cluster1Client().search(new SearchRequest("cluster2:test2"), RequestOptions.DEFAULT).getHits().getTotalHits().value
86-
);
89+
{
90+
Request searchRequest = new Request("POST", "/cluster2:test2/_search");
91+
ObjectPath doc = ObjectPath.createFromResponse(cluster1Client().performRequest(searchRequest));
92+
assertEquals(2, (int) doc.evaluate("hits.total.value"));
93+
}
8794
}
8895

8996
public void testSniffModeConnectionFails() throws IOException {
@@ -93,9 +100,9 @@ public void testSniffModeConnectionFails() throws IOException {
93100
.put("cluster.remote.cluster2alt.mode", "sniff")
94101
.put("cluster.remote.cluster2alt.seeds", cluster2RemoteClusterSeed)
95102
.build();
96-
updateClusterSettings(cluster1Client().getLowLevelClient(), settings);
103+
updateClusterSettings(cluster1Client(), settings);
97104

98-
assertFalse(isConnected(cluster1Client().getLowLevelClient()));
105+
assertFalse(isConnected(cluster1Client()));
99106
}
100107

101108
public void testHAProxyModeConnectionWorks() throws IOException {
@@ -105,14 +112,15 @@ public void testHAProxyModeConnectionWorks() throws IOException {
105112
.put("cluster.remote.haproxynosn.mode", "proxy")
106113
.put("cluster.remote.haproxynosn.proxy_address", proxyAddress)
107114
.build();
108-
updateClusterSettings(cluster1Client().getLowLevelClient(), settings);
115+
updateClusterSettings(cluster1Client(), settings);
109116

110-
assertTrue(isConnected(cluster1Client().getLowLevelClient()));
117+
assertTrue(isConnected(cluster1Client()));
111118

112-
assertEquals(
113-
2L,
114-
cluster1Client().search(new SearchRequest("haproxynosn:test2"), RequestOptions.DEFAULT).getHits().getTotalHits().value
115-
);
119+
{
120+
Request searchRequest = new Request("POST", "/haproxynosn:test2/_search");
121+
ObjectPath doc = ObjectPath.createFromResponse(cluster1Client().performRequest(searchRequest));
122+
assertEquals(2, (int) doc.evaluate("hits.total.value"));
123+
}
116124
}
117125

118126
public void testHAProxyModeConnectionWithSNIToCluster1Works() throws IOException {
@@ -123,14 +131,15 @@ public void testHAProxyModeConnectionWithSNIToCluster1Works() throws IOException
123131
.put("cluster.remote.haproxysni1.proxy_address", "haproxy:9600")
124132
.put("cluster.remote.haproxysni1.server_name", "application1.example.com")
125133
.build();
126-
updateClusterSettings(cluster2Client().getLowLevelClient(), settings);
134+
updateClusterSettings(cluster2Client(), settings);
127135

128-
assertTrue(isConnected(cluster2Client().getLowLevelClient()));
136+
assertTrue(isConnected(cluster2Client()));
129137

130-
assertEquals(
131-
1L,
132-
cluster2Client().search(new SearchRequest("haproxysni1:test1"), RequestOptions.DEFAULT).getHits().getTotalHits().value
133-
);
138+
{
139+
Request searchRequest = new Request("POST", "/haproxysni1:test1/_search");
140+
ObjectPath doc = ObjectPath.createFromResponse(cluster2Client().performRequest(searchRequest));
141+
assertEquals(1, (int) doc.evaluate("hits.total.value"));
142+
}
134143
}
135144

136145
public void testHAProxyModeConnectionWithSNIToCluster2Works() throws IOException {
@@ -141,14 +150,15 @@ public void testHAProxyModeConnectionWithSNIToCluster2Works() throws IOException
141150
.put("cluster.remote.haproxysni2.proxy_address", "haproxy:9600")
142151
.put("cluster.remote.haproxysni2.server_name", "application2.example.com")
143152
.build();
144-
updateClusterSettings(cluster1Client().getLowLevelClient(), settings);
153+
updateClusterSettings(cluster1Client(), settings);
145154

146-
assertTrue(isConnected(cluster1Client().getLowLevelClient()));
155+
assertTrue(isConnected(cluster1Client()));
147156

148-
assertEquals(
149-
2L,
150-
cluster1Client().search(new SearchRequest("haproxysni2:test2"), RequestOptions.DEFAULT).getHits().getTotalHits().value
151-
);
157+
{
158+
Request searchRequest = new Request("POST", "/haproxysni2:test2/_search");
159+
ObjectPath doc = ObjectPath.createFromResponse(cluster1Client().performRequest(searchRequest));
160+
assertEquals(2, (int) doc.evaluate("hits.total.value"));
161+
}
152162
}
153163

154164
@SuppressWarnings("unchecked")

0 commit comments

Comments
 (0)