This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch CASSANDRA-16847-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9b4d9990111a1688418fd1c57c291279b06c4d6d Merge: 979ab72 7f64f7d Author: Brandon Williams <[email protected]> AuthorDate: Thu Aug 12 10:49:32 2021 -0500 Merge branch 'CASSANDRA-16847' into CASSANDRA-16847-4.0 src/java/org/apache/cassandra/gms/Gossiper.java | 8 +++++--- src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index 2c38cfb,08cd106..6eb674f --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -770,10 -655,9 +770,9 @@@ public class Gossiper implements IFailu */ public void assassinateEndpoint(String address) throws UnknownHostException { - InetAddress endpoint = InetAddress.getByName(address); + InetAddressAndPort endpoint = InetAddressAndPort.getByName(address); runInGossipStageBlocking(() -> { EndpointState epState = endpointStateMap.get(endpoint); - Collection<Token> tokens; logger.warn("Assassinating {} via gossip", endpoint); if (epState == null) diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java index f2bbb9f,8300a39..ab21045 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@@ -561,10 -556,9 +561,9 @@@ public class TokenMetadat } } - public Collection<Token> getTokens(InetAddress endpoint) + public Collection<Token> getTokens(InetAddressAndPort endpoint) { assert endpoint != null; - assert isMember(endpoint); // don't want to return nulls lock.readLock().lock(); try --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
