Skip to content

HBASE-26410 Fix HBase TestCanaryTool for Java17 #3809

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

Merged
Apache9 merged 3 commits into from
Nov 9, 2021
Merged

HBASE-26410 Fix HBase TestCanaryTool for Java17 #3809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d51c6f6
HBASE-26410 Fix HBase TestCanaryTool for Java17
YutSean Nov 1, 2021
a404e1e
Added util function InetsocketAddress2string
YutSean Nov 2, 2021
3efa456
Fix the naming problem
YutSean Nov 3, 2021
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
15 changes: 15 additions & 0 deletions hbase-common/src/main/java/org/apache/hadoop/hbase/util/Addressing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,21 @@ public static boolean isLocalAddress(InetAddress addr) {
return local;
}

/**
* Given an InetSocketAddress object returns a String represent of it.
* This is a util method for Java 17. The toString() function of InetSocketAddress
* will flag the unresolved address with a substring in the string, which will result
* in unexpected problem. We should use this util function to get the string when we
* not sure whether the input address is resolved or not.
* @param address address to convert to a "host:port" String.
* @return the String represent of the given address, like "foo:1234".
*/
public static String inetSocketAddress2String(InetSocketAddress address) {
return address.isUnresolved() ?
address.toString().replace("/<unresolved>", "") :
address.toString();
}

/**
* Interface for AddressSelectionCondition to check if address is acceptable
*/
Expand Down
3 changes: 2 additions & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.apache.hadoop.hbase.HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT;
import static org.apache.hadoop.hbase.HConstants.ZOOKEEPER_ZNODE_PARENT;
import static org.apache.hadoop.hbase.util.Addressing.inetSocketAddress2String;
import java.io.Closeable;
import java.io.IOException;
import java.net.BindException;
Expand Down Expand Up @@ -1707,7 +1708,7 @@ protected ZookeeperMonitor(Connection connection, String[] monitorTargets, boole
new ConnectStringParser(ZKConfig.getZKQuorumServersString(configuration));
hosts = Lists.newArrayList();
for (InetSocketAddress server : parser.getServerAddresses()) {
hosts.add(server.toString());
hosts.add(inetSocketAddress2String(server));
}
if (allowedFailures > (hosts.size() - 1) / 2) {
LOG.warn(
Expand Down