From 92564bce660914c910a32c94fc6a3d4674223029 Mon Sep 17 00:00:00 2001 From: bjwangsonglin Date: Mon, 19 Oct 2020 10:42:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E9=85=8D=E7=BD=AE=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=B6=E6=8F=90=E7=A4=BA=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=80=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=8F=90=E7=A4=BA=EF=BC=9Atopic=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/internal/cluster/MetadataUpdater.java | 9 +++++---- .../main/java/org/joyqueue/toolkit/network/IpUtil.java | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/cluster/MetadataUpdater.java b/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/cluster/MetadataUpdater.java index 8425da58c..a942bbba4 100644 --- a/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/cluster/MetadataUpdater.java +++ b/joyqueue-client/joyqueue-client-core/src/main/java/org/joyqueue/client/internal/cluster/MetadataUpdater.java @@ -121,10 +121,11 @@ public TopicMetadata updateTopicMetadata(String topic, String app) { } catch (Exception e) { logger.error("update topic metadata exception, topic: {}, app: {}", topic, app, e); - if (metadataCacheManager.getTopicMetadata(topic, app) == null) { - metadataCacheManager.putTopicMetadata(topic, app, new TopicMetadata(JoyQueueCode.CN_SERVICE_NOT_AVAILABLE)); - } - return null; +// if (metadataCacheManager.getTopicMetadata(topic, app) == null) { +// metadataCacheManager.putTopicMetadata(topic, app, new TopicMetadata(JoyQueueCode.CN_SERVICE_NOT_AVAILABLE)); +// } +// return null; + throw e; } } diff --git a/joyqueue-common/joyqueue-toolkit/src/main/java/org/joyqueue/toolkit/network/IpUtil.java b/joyqueue-common/joyqueue-toolkit/src/main/java/org/joyqueue/toolkit/network/IpUtil.java index bf9984b00..c001beaae 100644 --- a/joyqueue-common/joyqueue-toolkit/src/main/java/org/joyqueue/toolkit/network/IpUtil.java +++ b/joyqueue-common/joyqueue-toolkit/src/main/java/org/joyqueue/toolkit/network/IpUtil.java @@ -227,6 +227,10 @@ public static String toAddress(final SocketAddress address) { InetSocketAddress isa = (InetSocketAddress) address; StringBuilder builder = new StringBuilder(50); if (address instanceof InetSocketAddress) { + InetAddress ia = isa.getAddress(); + if (ia == null) { + throw new RuntimeException("UnknownHost[" + ((InetSocketAddress) address).getHostName() + "]"); + } builder.append(isa.getAddress().getHostAddress()); String separator = isValidIpV4Address(((InetSocketAddress) address).getHostString()) ? IPV4_PORT_SEPARATOR : IPV6_PORT_SEPARATOR; builder.append(separator).append(isa.getPort()); @@ -986,4 +990,4 @@ public static boolean isValidIpV4Address(String value) { } -} +} \ No newline at end of file