Skip to content
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

Fix issue with C* <= 2.1.9 not having the StorageServiceMBean.getEndp… #123

Merged
merged 1 commit into from
Jun 21, 2017
Merged

Fix issue with C* <= 2.1.9 not having the StorageServiceMBean.getEndp… #123

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
12 changes: 8 additions & 4 deletions src/main/java/com/spotify/reaper/cassandra/JmxProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static com.google.common.base.Preconditions.checkNotNull;

import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.math.BigInteger;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
Expand Down Expand Up @@ -58,7 +59,7 @@
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;

import com.google.common.collect.Maps;
import com.datastax.driver.core.policies.EC2MultiRegionAddressTranslator;
import com.spotify.reaper.ReaperException;
import com.spotify.reaper.core.Cluster;
Expand Down Expand Up @@ -252,9 +253,12 @@ public List<String> tokenRangeToEndpoint(String keyspace, RingRange tokenRange)
@NotNull
public Map<String, String> getEndpointToHostId() {
checkNotNull(ssProxy, "Looks like the proxy is not connected");
Map<String, String> hosts =
((StorageServiceMBean) ssProxy).getEndpointToHostId();

Map<String, String> hosts = Maps.newHashMap();
try{
hosts = ((StorageServiceMBean) ssProxy).getEndpointToHostId();
} catch(UndeclaredThrowableException e){
hosts = ((StorageServiceMBean) ssProxy).getHostIdMap();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MINOR Remove this use of "getHostIdMap"; it is deprecated. rule

}
return hosts;
}

Expand Down