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

[ISSUE #9039]Improve Code Readability for Name Server Address Management #9043

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[ISSUE #9039]Improve Code Readability for Name Server Address Management #9043

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0c8ff
Refactor name server address update logic
asapple Dec 10, 2024
2152ae8
Optimize shouldUpdateAddressList method using containsAll
asapple Dec 10, 2024
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
85 changes: 51 additions & 34 deletions remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,41 +500,58 @@ public void closeChannel(final Channel channel) {
}

@Override
public void updateNameServerAddressList(List<String> addrs) {
List<String> old = this.namesrvAddrList.get();
boolean update = false;

if (!addrs.isEmpty()) {
if (null == old) {
update = true;
} else if (addrs.size() != old.size()) {
update = true;
} else {
for (String addr : addrs) {
if (!old.contains(addr)) {
update = true;
break;
}
}
}
public void updateNameServerAddressList(List<String> newAddresses) {
List<String> oldAddresses = this.namesrvAddrList.get();

if (update) {
Collections.shuffle(addrs);
LOGGER.info("name server address updated. NEW : {} , OLD: {}", addrs, old);
this.namesrvAddrList.set(addrs);

// should close the channel if choosed addr is not exist.
String chosenNameServerAddr = this.namesrvAddrChoosed.get();
if (chosenNameServerAddr != null && !addrs.contains(chosenNameServerAddr)) {
namesrvAddrChoosed.compareAndSet(chosenNameServerAddr, null);
for (String addr : this.channelTables.keySet()) {
if (addr.contains(chosenNameServerAddr)) {
ChannelWrapper channelWrapper = this.channelTables.get(addr);
if (channelWrapper != null) {
channelWrapper.close();
}
}
}
// Check if the address list needs to be updated
if (shouldUpdateAddressList(newAddresses, oldAddresses)) {
Collections.shuffle(newAddresses);
LOGGER.info("name server address updated. NEW : {} , OLD: {}", newAddresses, oldAddresses);
this.namesrvAddrList.set(newAddresses);

// Handle channel closure if the chosen address is not in the new list
handleChannelClosureIfNeeded(newAddresses);
}
}

/**
* Check if the address list should be updated
*/
private static boolean shouldUpdateAddressList(List<String> newAddresses, List<String> oldAddresses) {
if (newAddresses.isEmpty()) {
return false;
}

if (oldAddresses == null || newAddresses.size() != oldAddresses.size()) {
return true;
}

return !new HashSet<>(newAddresses).containsAll(oldAddresses);
}

/**
* Handle channel closure if the chosen address is no longer in the new list
*/
private void handleChannelClosureIfNeeded(List<String> newAddresses) {
String chosenNameServerAddr = this.namesrvAddrChoosed.get();
if (chosenNameServerAddr != null && !newAddresses.contains(chosenNameServerAddr)) {
// Set the chosen address to null
namesrvAddrChoosed.compareAndSet(chosenNameServerAddr, null);

// Close the channels associated with the chosen address
closeChannelsForAddress(chosenNameServerAddr);
}
}

/**
* Close channels associated with the given address
*/
private void closeChannelsForAddress(String chosenNameServerAddr) {
for (String addr : this.channelTables.keySet()) {
if (addr.contains(chosenNameServerAddr)) {
ChannelWrapper channelWrapper = this.channelTables.get(addr);
if (channelWrapper != null) {
channelWrapper.close();
}
}
}
Expand Down
Loading