Skip to content

Check if sniffer was able to determine the version before testing if it's a 2.x #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marko-bekhta wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −1
Open

Check if sniffer was able to determine the version before testing if it's a 2.x #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...o/elastic/clients/transport/rest5_client/low_level/sniffer/ElasticsearchNodesSniffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ else if (fieldName != null) { // it's an unknown object that needs to be skipped
realAttributes.put(entry.getKey(), singletonList(entry.getValue()));
}

if (version.startsWith("2.")) {
if (version != null && version.startsWith("2.")) {
/*
* 2.x doesn't send roles, instead we try to read them from
* attributes.
Expand Down
8 changes: 8 additions & 0 deletions ...clients/transport/rest5_client/low_level/sniffer/ElasticsearchNodesSnifferParseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ public void test7x() throws IOException {
);
}

@Test
public void testNoVersion() throws IOException {
checkFile(
"no_version_nodes_http.json",
node(9200, "m1", null, "master", "ingest")
);
}

@Test
public void testParsingPublishAddressWithPreES7Format() throws IOException {
InputStream in = this.getClass().getResourceAsStream("es6_nodes_publication_address_format.json");
Expand Down
35 changes: 35 additions & 0 deletions ...es/co/elastic/clients/transport/rest5_client/low_level/sniffer/no_version_nodes_http.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"_nodes": {
"total": 1,
"successful": 1,
"failed": 0
},
"cluster_name": "elasticsearch",
"nodes": {
"ikXK_skVTfWkhONhldnbkw": {
"name": "m1",
"transport_address": "127.0.0.1:9300",
"host": "127.0.0.1",
"ip": "127.0.0.1",
"build_hash": "8f0685b",
"roles": [
"master",
"ingest"
],
"attributes": {
"dummy": "everyone_has_me",
"number": "1",
"array.0": "m",
"array.1": "1"
},
"http": {
"bound_address": [
"[::1]:9200",
"127.0.0.1:9200"
],
"publish_address": "127.0.0.1:9200",
"max_content_length_in_bytes": 104857600
}
}
}
}
Loading