Skip to content

core: simplify DnsNameResolver.resolveAddresses() #12420

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

core: simplify DnsNameResolver.resolveAddresses() #12420

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e32a2cd
simplify DnsNameResolver.resolveAddresses()
panchenko Oct 16, 2025
6247935
update undertow
panchenko Oct 16, 2025
5fad840
Revert "update undertow"
panchenko Oct 17, 2025
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
18 changes: 3 additions & 15 deletions core/src/main/java/io/grpc/internal/DnsNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Throwables;
import com.google.common.base.Verify;
import com.google.common.base.VerifyException;
import io.grpc.Attributes;
Expand Down Expand Up @@ -211,20 +210,8 @@ public void refresh() {
resolve();
}

private List<EquivalentAddressGroup> resolveAddresses() {
List<? extends InetAddress> addresses;
Exception addressesException = null;
try {
addresses = addressResolver.resolveAddress(host);
} catch (Exception e) {
addressesException = e;
Throwables.throwIfUnchecked(e);
throw new RuntimeException(e);
} finally {
if (addressesException != null) {
logger.log(Level.FINE, "Address resolution failure", addressesException);
}
}
private List<EquivalentAddressGroup> resolveAddresses() throws Exception {
List<? extends InetAddress> addresses = addressResolver.resolveAddress(host);
// Each address forms an EAG
List<EquivalentAddressGroup> servers = new ArrayList<>(addresses.size());
for (InetAddress inetAddr : addresses) {
Expand Down Expand Up @@ -280,6 +267,7 @@ protected InternalResolutionResult doResolve(boolean forceTxt) {
try {
result.addresses = resolveAddresses();
} catch (Exception e) {
logger.log(Level.FINE, "Address resolution failure", e);
if (!forceTxt) {
result.error =
Status.UNAVAILABLE.withDescription("Unable to resolve host " + host).withCause(e);
Expand Down