kubernetes
/
examples
mirror of https://github.com/kubernetes/examples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5808 from mikeln/issue-5737 

Cassandra Cluster Example Add Check for Null Endpoints (redo2)
This commit is contained in:
Brendan Burns 2015-03-24 10:10:10 -07:00
parent 62475238eb 8c38859456
commit 4880be6ce3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cassandra/README.md
View File

@ -295,11 +295,14 @@ 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");
} }

3
cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java
View File

@ -70,11 +70,14 @@ 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");
} }