[Dubbo-2064] Ipv6 support #2079

ralf0131 · 2018-07-14T09:02:21Z

What is the purpose of the change

Add ipv6 support for Dubbo #2064

Brief changelog

Support parsing ipv6 address in url
Support ipv6 multicast network
ipv6 support is available if java.net.preferIPv6Addresses is set to true

Verifying this change

How to test ipv6 support:

dubbo-demo-provider.xml

<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
       xmlns="http://www.springframework.org/schema/beans"
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
       http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">

    <!-- provider's application name, used for tracing dependency relationship -->
    <dubbo:application name="demo-provider"/>

    <!-- use multicast registry center to export service -->
    <dubbo:registry address="multicast://FF02:0:0:0:0:0:0:FC:1234"/>

    <!-- use dubbo protocol to export service on port 20880 -->
    <dubbo:protocol name="dubbo" port="20880"/>

    <!-- service implementation, as same as regular local bean -->
    <bean id="demoService" class="org.apache.dubbo.demo.provider.DemoServiceImpl"/>

    <!-- declare the service interface to be exported -->
    <dubbo:service interface="org.apache.dubbo.demo.DemoService" ref="demoService"/>

</beans>

dubbo-demo-consumer.xml

<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
       xmlns="http://www.springframework.org/schema/beans"
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
       http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">

    <!-- consumer's application name, used for tracing dependency relationship (not a matching criterion),
    don't set it same as provider -->
    <dubbo:application name="demo-consumer"/>

    <!-- use multicast registry center to discover service -->
    <dubbo:registry address="multicast://FF02:0:0:0:0:0:0:FC:1234"/>

    <!-- generate proxy for the remote service, then demoService can be used in the same way as the
    local regular interface -->
    <dubbo:reference id="demoService" check="false" interface="org.apache.dubbo.demo.DemoService"/>

</beans>

Add -Djava.net.preferIPv6Addresses=true before starting Provider/Consumer.

Follow this checklist to help us incorporate your contribution quickly and easily:

Make sure there is a GITHUB_issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
Run mvn clean install -DskipTests & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
If this contribution is large, please follow the Software Donation Guide.

…ctional change.

luyuanwan · 2018-07-14T10:03:58Z

Why not create a IPV6Utils class? @ralf0131 :)

codecov-io · 2018-07-15T10:48:53Z

Codecov Report

Merging #2079 into master will increase coverage by 1.47%.
The diff coverage is 33.84%.

@@             Coverage Diff              @@
##             master    #2079      +/-   ##
============================================
+ Coverage     53.12%   54.59%   +1.47%     
- Complexity     4959     5127     +168     
============================================
  Files           559      559              
  Lines         24894    25195     +301     
  Branches       4432     4569     +137     
============================================
+ Hits          13225    13756     +531     
+ Misses         9650     9396     -254     
- Partials       2019     2043      +24

Impacted Files	Coverage Δ	Complexity Δ
.../dubbo/registry/integration/RegistryDirectory.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...n/java/org/apache/dubbo/common/utils/NetUtils.java	`53.59% <0%> (-8.53%)`	`44 <0> (ø)`
...mon/src/main/java/org/apache/dubbo/common/URL.java	`26.75% <100%> (+0.1%)`	`81 <0> (+1)`	⬆️
...he/dubbo/registry/multicast/MulticastRegistry.java	`57.32% <72%> (-0.42%)`	`38 <4> (-3)`
...ubbo/common/compiler/support/AdaptiveCompiler.java	`77.77% <0%> (-11.12%)`	`3% <0%> (-1%)`
...apache/dubbo/rpc/protocol/rest/BaseRestServer.java	`88.88% <0%> (-11.12%)`	`7% <0%> (-1%)`
...he/dubbo/remoting/transport/netty/NettyClient.java	`72.88% <0%> (-10.17%)`	`12% <0%> (-1%)`
...apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java	`58.06% <0%> (-6.46%)`	`3% <0%> (ø)`
...ubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java	`45.83% <0%> (-4.17%)`	`3% <0%> (ø)`
...rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java	`51.89% <0%> (-3.8%)`	`11% <0%> (-2%)`
... and 34 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cd68437...fef30cc. Read the comment docs.

ralf0131 · 2018-07-16T02:12:43Z

@luyuanwan Good suggestion!

For me, I think the current refactoring is not large enough to make that change. You can always improve it as you wish, and send the pull request.

zonghaishang · 2018-08-01T02:44:07Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java

-                                } catch (Throwable e) {
-                                    logger.warn(e);
-                                }
+            while (interfaces.hasMoreElements()) {


public static Enumeration<NetworkInterface> getNetworkInterfaces() throws SocketException { final NetworkInterface[] netifs = getAll(); // specified to return null if no network interfaces if (netifs == null) return null;

Should check the interfaces property null value

Thanks, I am using Java 10, the implementation is different with Java 8. In Java 10 the implementation guarantees no null value is returned. I will add the null check.

zonghaishang · 2018-08-01T02:45:06Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java

                    }
+                } catch (Throwable e) {


rename e to ignored will be better

Hi, this is just coding style. I prefer to use

catch (Throwable e) { // ignore }

instead of

catch(Throwable ignored) { }

I found several codes in Dubbo's code that is written in the former way, but did not find my codes that is written in the way you suggested.

So I guess I am going to leave it unchanged.

zonghaishang · 2018-08-01T02:45:32Z

dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java

                            }
+                        } catch (Throwable e) {


rename e to ignored will be better

zonghaishang · 2018-08-01T02:54:25Z

dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java

+
+    @Test
+    public void testIsValidV6Address() {
+        System.setProperty("java.net.preferIPv6Addresses", "true");


String saved = System.setProperty("java.net.preferIPv6Addresses"); System.setProperty("java.net.preferIPv6Addresses", "true"); ... System.setProperty("java.net.preferIPv6Addresses", saved);

This way is more elegant and will not break subsequent tests.

String saved = System.getProperty("java.net.preferIPv6Addresses");
System.setProperty("java.net.preferIPv6Addresses", "true");
...
System.setProperty("java.net.preferIPv6Addresses", saved);

Good catch, it is better.

ralf0131 · 2018-08-02T08:09:36Z

@zonghaishang I've improved the code based on your review comments, could you take a look?

zonghaishang · 2018-08-02T10:02:05Z

It looks good to me.

ralf0131 added 5 commits July 13, 2018 15:51

Url support ipv6 address.

4a554bc

Unwrap if statement, since returned Enumeration can't be null. No fun…

8a23fe3

…ctional change.

Ensure Dubbo provider/consumer both works under ipv6 multicast network.

3602e8e

Fix typo.

0e09fb0

Fix typo.

eb00834

Disable mocking final class feature of mockito to avoid UT failure.

cba34cd

zonghaishang reviewed Aug 1, 2018

View reviewed changes

ralf0131 added 3 commits August 2, 2018 10:31

Add null check for NetworkInterface.getNetworkInterfaces()

db01ebd

Improve UT.

9de876b

Improve UT.

fef30cc

zonghaishang merged commit 413a2a0 into apache:master Aug 2, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Dubbo-2064] Ipv6 support #2079

[Dubbo-2064] Ipv6 support #2079

ralf0131 commented Jul 14, 2018

luyuanwan commented Jul 14, 2018

codecov-io commented Jul 15, 2018 •

edited

Loading

ralf0131 commented Jul 16, 2018

zonghaishang Aug 1, 2018

ralf0131 Aug 1, 2018

zonghaishang Aug 1, 2018

ralf0131 Aug 2, 2018

zonghaishang Aug 1, 2018

zonghaishang Aug 1, 2018

yangjinhe Aug 1, 2018

ralf0131 Aug 1, 2018

ralf0131 commented Aug 2, 2018

zonghaishang commented Aug 2, 2018

[Dubbo-2064] Ipv6 support #2079

[Dubbo-2064] Ipv6 support #2079

Conversation

ralf0131 commented Jul 14, 2018

What is the purpose of the change

Brief changelog

Verifying this change

luyuanwan commented Jul 14, 2018

codecov-io commented Jul 15, 2018 • edited Loading

Codecov Report

ralf0131 commented Jul 16, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ralf0131 commented Aug 2, 2018

zonghaishang commented Aug 2, 2018

codecov-io commented Jul 15, 2018 •

edited

Loading