andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EndpointSnitchInfo: Fix getRack/DC host handling

Browse Source 
I.e. our localhost might be (and probably is) different from scyllas
"fb::broadcast", and if not, try to get numerical asap.
This commit is contained in:
Calle Wilund 2016-10-24 08:33:19 +00:00
parent 21a343d003
commit 3fe9cfc232
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/apache/cassandra/locator/EndpointSnitchInfo.java
View File

@ -17,6 +17,8 @@
*/ */
package org.apache.cassandra.locator; package org.apache.cassandra.locator;
import static java.util.Collections.singletonMap;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -49,11 +51,8 @@ public class EndpointSnitchInfo extends APIMBean implements EndpointSnitchInfoMB
@Override @Override
public String getRack(String host) throws UnknownHostException { public String getRack(String host) throws UnknownHostException {
log("getRack(String host) throws UnknownHostException"); log("getRack(String host) throws UnknownHostException");
MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>(); MultivaluedMap<String, String> queryParams = host != null ? new MultivaluedHashMap<String, String>(
if (host == null) { singletonMap("host", InetAddress.getByName(host).getHostAddress())) : null;
host = InetAddress.getLoopbackAddress().getHostAddress();
}
queryParams.add("host", host);
return client.getStringValue("/snitch/rack", queryParams, 10000); return client.getStringValue("/snitch/rack", queryParams, 10000);
} }
@ -67,11 +66,8 @@ public class EndpointSnitchInfo extends APIMBean implements EndpointSnitchInfoMB
@Override @Override
public String getDatacenter(String host) throws UnknownHostException { public String getDatacenter(String host) throws UnknownHostException {
log(" getDatacenter(String host) throws UnknownHostException"); log(" getDatacenter(String host) throws UnknownHostException");
MultivaluedMap<String, String> queryParams = new MultivaluedHashMap<String, String>(); MultivaluedMap<String, String> queryParams = host != null ? new MultivaluedHashMap<String, String>(
if (host == null) { singletonMap("host", InetAddress.getByName(host).getHostAddress())) : null;
host = InetAddress.getLoopbackAddress().getHostAddress();
}
queryParams.add("host", host);
return client.getStringValue("/snitch/datacenter", queryParams, 10000); return client.getStringValue("/snitch/datacenter", queryParams, 10000);
} }