Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(zk-registry) Filter out phantom addresses in the registry

Browse Source 
The change adds a hostname validation step to remove endpoints from the ZkServiceRegistry when they do not resolve.  This is a scenario that primarily happens when running in docker, and the entire system is started and stopped.
This commit is contained in:
Viktor Lofgren 2024-02-20 18:09:11 +01:00
parent a69c0b2718
commit 73947d9eca
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/ZkServiceRegistry.java
View File

@ -192,10 +192,18 @@ public class ZkServiceRegistry implements ServiceRegistryIf {
.getData() .getData()
.forPath(ZKPaths.makePath(restRoot, uuid)); .forPath(ZKPaths.makePath(restRoot, uuid));
String hostAndPort = new String(data); String hostAndPort = new String(data);
ret.add(RestEndpoint var address = RestEndpoint
.parse(hostAndPort) .parse(hostAndPort)
.asInstance(UUID.fromString(uuid)) .asInstance(UUID.fromString(uuid));
);
// Ensure that the address is resolvable
// (this reduces the risk of exceptions when trying to connect to the service)
if (!address.endpoint().validateHost()) {
logger.warn("Omitting stale address {}, address does not resolve", address);
continue;
}
ret.add(address);
} }
@ -221,11 +229,20 @@ public class ZkServiceRegistry implements ServiceRegistryIf {
byte[] data = curatorFramework byte[] data = curatorFramework
.getData() .getData()
.forPath(ZKPaths.makePath(restRoot, uuid)); .forPath(ZKPaths.makePath(restRoot, uuid));
String hostAndPort = new String(data); String hostAndPort = new String(data);
ret.add(GrpcEndpoint var address = GrpcEndpoint
.parse(hostAndPort) .parse(hostAndPort)
.asInstance(UUID.fromString(uuid)) .asInstance(UUID.fromString(uuid));
);
// Ensure that the address is resolvable
// (this reduces the risk of exceptions when trying to connect to the service)
if (!address.endpoint().validateHost()) {
logger.warn("Omitting stale address {}, address does not resolve", address);
continue;
}
ret.add(address);
} }

20
code/common/service-discovery/src/main/java/nu/marginalia/service/discovery/property/ServiceEndpoint.java
View File

@ -3,9 +3,7 @@ package nu.marginalia.service.discovery.property;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import java.net.InetSocketAddress; import java.net.*;
import java.net.URI;
import java.net.URL;
import java.util.UUID; import java.util.UUID;
public sealed interface ServiceEndpoint { public sealed interface ServiceEndpoint {
@ -17,6 +15,22 @@ public sealed interface ServiceEndpoint {
return new InetSocketAddress(host(), port()); return new InetSocketAddress(host(), port());
} }
/** Validate the host by checking if it is a valid IP address or a hostname that can be resolved.
*
* @return true if the host is a valid
*/
default boolean validateHost() {
try {
// Throws UnknownHostException if the host is not a valid IP address or hostname
// (this should not be slow since the DNS lookup should be local, and if it isn't;
// should be cached by the OS or the JVM)
InetAddress.getByName(host());
return true;
} catch (UnknownHostException e) {
return false;
}
}
static ServiceEndpoint forSchema(ApiSchema schema, String host, int port) { static ServiceEndpoint forSchema(ApiSchema schema, String host, int port) {
return switch (schema) { return switch (schema) {
case REST -> new RestEndpoint(host, port); case REST -> new RestEndpoint(host, port);