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

Jump to bottom

HBASE-27237 Address is shoule be case insensitive #4670

Closed
wants to merge 4 commits into from
Closed

HBASE-27237 Address is shoule be case insensitive #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
699d15a
HBASE-27237 Address is shoule be case insensitive
ZhangIssac Jul 31, 2022
3556362
Revert "HBASE-27237 Address is shoule be case insensitive"
Aug 1, 2022
f674be7
HBASE-27237 The servername in the rsgroup table should be lowercase
Aug 2, 2022
be12dd6
Merge pull request #1 from apache/master
ZhangIssac Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3460,7 +3460,7 @@ public static RSGroupInfo toGroupInfo(RSGroupProtos.RSGroupInfo proto) {
RSGroupInfo rsGroupInfo = new RSGroupInfo(proto.getName());

Collection<Address> addresses = proto.getServersList().parallelStream()
.map(serverName -> Address.fromParts(serverName.getHostName(), serverName.getPort()))
.map(serverName -> Address.fromParts(serverName.getHostName().toLowerCase(Locale.ROOT), serverName.getPort()))
.collect(Collectors.toList());
rsGroupInfo.addAllServers(addresses);

Expand Down
7 changes: 4 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
Expand Down Expand Up @@ -162,7 +163,7 @@ public void moveServers(RpcController controller, MoveServersRequest request,
MoveServersResponse.Builder builder = MoveServersResponse.newBuilder();
Set<Address> hostPorts = Sets.newHashSet();
for (HBaseProtos.ServerName el : request.getServersList()) {
hostPorts.add(Address.fromParts(el.getHostName(), el.getPort()));
hostPorts.add(Address.fromParts(el.getHostName().toLowerCase(Locale.ROOT), el.getPort()));
}
LOG.info(master.getClientIdAuditPrefix() + " move servers " + hostPorts + " to rsgroup "
+ request.getTargetGroup());
Expand Down Expand Up @@ -357,7 +358,7 @@ public void moveServersAndTables(RpcController controller, MoveServersAndTablesR
MoveServersAndTablesResponse.Builder builder = MoveServersAndTablesResponse.newBuilder();
Set<Address> hostPorts = Sets.newHashSet();
for (HBaseProtos.ServerName el : request.getServersList()) {
hostPorts.add(Address.fromParts(el.getHostName(), el.getPort()));
hostPorts.add(Address.fromParts(el.getHostName().toLowerCase(Locale.ROOT), el.getPort()));
}
Set<TableName> tables = new HashSet<>(request.getTableNameList().size());
for (HBaseProtos.TableName tableName : request.getTableNameList()) {
Expand Down Expand Up @@ -388,7 +389,7 @@ public void removeServers(RpcController controller, RemoveServersRequest request
RemoveServersResponse.Builder builder = RemoveServersResponse.newBuilder();
Set<Address> servers = Sets.newHashSet();
for (HBaseProtos.ServerName el : request.getServersList()) {
servers.add(Address.fromParts(el.getHostName(), el.getPort()));
servers.add(Address.fromParts(el.getHostName().toLowerCase(Locale.ROOT), el.getPort()));
}
LOG.info(
master.getClientIdAuditPrefix() + " remove decommissioned servers from rsgroup: " + servers);
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ private SortedSet<Address> getDefaultServers(List<RSGroupInfo> rsGroupInfoList)
// Get all online servers from Zookeeper and find out servers in default group
SortedSet<Address> defaultServers = Sets.newTreeSet();
for (ServerName serverName : masterServices.getServerManager().getOnlineServers().keySet()) {
Address server = Address.fromParts(serverName.getHostname(), serverName.getPort());
Address server = Address.fromParts(serverName.getHostnameLowerCase(), serverName.getPort());
if (!serversInOtherGroup.contains(server)) { // not in other groups
defaultServers.add(server);
}
Expand Down