From 55aaf10163eaaa5c6ba6ab8d1ce16447c941d82a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Mon, 17 Feb 2020 17:13:40 +0100 Subject: [PATCH] [Grid] Enabling IPv6, fixes #7541 Also enabling `--detect-drivers` for nodes --- .../src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java | 2 ++ .../src/org/openqa/selenium/events/zeromq/UnboundEventBus.java | 2 ++ .../src/org/openqa/selenium/grid/node/httpd/NodeFlags.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/java/server/src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java b/java/server/src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java index 04d37bf578fb7..dc9f0e86e80fc 100644 --- a/java/server/src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java +++ b/java/server/src/org/openqa/selenium/events/zeromq/BoundZmqEventBus.java @@ -46,10 +46,12 @@ class BoundZmqEventBus implements EventBus { LOG.info(String.format("XPUB binding to %s, XSUB binding to %s", xpubAddr, xsubAddr)); xpub = context.createSocket(SocketType.XPUB); + xpub.setIPv6(true); xpub.setImmediate(true); xpub.bind(xpubAddr.bindTo); xsub = context.createSocket(SocketType.XSUB); + xsub.setIPv6(true); xsub.setImmediate(true); xsub.bind(xsubAddr.bindTo); diff --git a/java/server/src/org/openqa/selenium/events/zeromq/UnboundEventBus.java b/java/server/src/org/openqa/selenium/events/zeromq/UnboundEventBus.java index 0576c0f88c3bf..ffd68af17bd93 100644 --- a/java/server/src/org/openqa/selenium/events/zeromq/UnboundEventBus.java +++ b/java/server/src/org/openqa/selenium/events/zeromq/UnboundEventBus.java @@ -64,10 +64,12 @@ class UnboundZmqEventBus implements EventBus { LOG.info(String.format("Connecting to %s and %s", publishConnection, subscribeConnection)); sub = context.createSocket(SocketType.SUB); + sub.setIPv6(true); sub.connect(publishConnection); sub.subscribe(new byte[0]); pub = context.createSocket(SocketType.PUB); + pub.setIPv6(true); pub.connect(subscribeConnection); ZMQ.Poller poller = context.createPoller(1); diff --git a/java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java b/java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java index bbe2f3ae73ae2..e99d8537fa26c 100644 --- a/java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java +++ b/java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java @@ -27,5 +27,5 @@ class NodeFlags { names = {"--detect-drivers"}, description = "Autodetect which drivers are available on the current system, and add them to the node.") @ConfigValue(section = "node", name = "detect-drivers") - public boolean autoconfigure; + public boolean autoconfigure = true; }