Skip to content

K
k3s
Commit 9707a944 authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Merge pull request #5808 from mikeln/issue-5737

Cassandra Cluster Example Add Check for Null Endpoints (redo2)
parents aee9bdd6 bbca7217
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
examples/cassandra/README.md
View file @ 9707a944
...@@ -295,10 +295,13 @@ public class KubernetesSeedProvider implements SeedProvider { ...@@ -295,10 +295,13 @@ public class KubernetesSeedProvider implements SeedProvider {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Endpoints endpoints = mapper.readValue(url, Endpoints.class); Endpoints endpoints = mapper.readValue(url, Endpoints.class);
if (endpoints != null) { if (endpoints != null) {
// Here is a problem point, endpoints.endpoints can be null in first node cases.
if (endpoints.endpoints != null){
for (String endpoint : endpoints.endpoints) { for (String endpoint : endpoints.endpoints) {
String[] parts = endpoint.split(":"); String[] parts = endpoint.split(":");
list.add(InetAddress.getByName(parts[0])); list.add(InetAddress.getByName(parts[0]));
} }
}
} }
} catch (IOException ex) { } catch (IOException ex) {
logger.warn("Request to kubernetes apiserver failed"); logger.warn("Request to kubernetes apiserver failed");
......
examples/cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java
View file @ 9707a944
...@@ -70,10 +70,13 @@ public class KubernetesSeedProvider implements SeedProvider { ...@@ -70,10 +70,13 @@ public class KubernetesSeedProvider implements SeedProvider {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
Endpoints endpoints = mapper.readValue(url, Endpoints.class); Endpoints endpoints = mapper.readValue(url, Endpoints.class);
if (endpoints != null) { if (endpoints != null) {
// Here is a problem point, endpoints.endpoints can be null in first node cases.
if (endpoints.endpoints != null){
for (String endpoint : endpoints.endpoints) { for (String endpoint : endpoints.endpoints) {
String[] parts = endpoint.split(":"); String[] parts = endpoint.split(":");
list.add(InetAddress.getByName(parts[0])); list.add(InetAddress.getByName(parts[0]));
} }
}
} }
} catch (IOException ex) { } catch (IOException ex) {
logger.warn("Request to kubernetes apiserver failed"); logger.warn("Request to kubernetes apiserver failed");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment