Fixed apache#1021, enhance graceful shutdown: wait for registry notification before destroy server.

chickenlj · chickenlj · commit b0d2574e07e9 · 2018-01-23T15:28:21.000+08:00
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java
@@ -306,4 +306,26 @@ public static int getPid() {
         return PID;
     }
 
+    @SuppressWarnings("deprecation")
+    public static int getServerShutdownTimeout() {
+        int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
+        String value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY);
+        if (value != null && value.length() > 0) {
+            try {
+                timeout = Integer.parseInt(value);
+            } catch (Exception e) {
+            }
+        } else {
+            value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_SECONDS_KEY);
+            if (value != null && value.length() > 0) {
+                try {
+                    timeout = Integer.parseInt(value) * 1000;
+                } catch (Exception e) {
+                }
+            }
+        }
+
+        return timeout;
+    }
+
 }
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java
@@ -20,6 +20,7 @@
 import com.alibaba.dubbo.common.serialize.Serialization;
 import com.alibaba.dubbo.common.status.StatusChecker;
 import com.alibaba.dubbo.common.threadpool.ThreadPool;
+import com.alibaba.dubbo.common.utils.ConfigUtils;
 import com.alibaba.dubbo.config.support.Parameter;
 import com.alibaba.dubbo.registry.support.AbstractRegistryFactory;
 import com.alibaba.dubbo.remoting.Codec;
@@ -145,6 +146,14 @@ public static void destroyAll() {
             return;
         }
         AbstractRegistryFactory.destroyAll();
+
+        // Wait for registry notification
+        try {
+            Thread.sleep(ConfigUtils.getServerShutdownTimeout());
+        } catch (InterruptedException e) {
+            logger.warn("Interrupted unexpectedly when waiting for registry notification during shutdown process!");
+        }
+
         ExtensionLoader<Protocol> loader = ExtensionLoader.getExtensionLoader(Protocol.class);
         for (String protocolName : loader.getLoadedExtensions()) {
             try {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java
@@ -16,12 +16,10 @@
  */
 package com.alibaba.dubbo.rpc.protocol;
 
-import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.logger.Logger;
 import com.alibaba.dubbo.common.logger.LoggerFactory;
 import com.alibaba.dubbo.common.utils.ConcurrentHashSet;
-import com.alibaba.dubbo.common.utils.ConfigUtils;
 import com.alibaba.dubbo.rpc.Exporter;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
@@ -52,28 +50,6 @@ protected static String serviceKey(int port, String serviceName, String serviceV
         return ProtocolUtils.serviceKey(port, serviceName, serviceVersion, serviceGroup);
     }
 
-    @SuppressWarnings("deprecation")
-    protected static int getServerShutdownTimeout() {
-        int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
-        String value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY);
-        if (value != null && value.length() > 0) {
-            try {
-                timeout = Integer.parseInt(value);
-            } catch (Exception e) {
-            }
-        } else {
-            value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_SECONDS_KEY);
-            if (value != null && value.length() > 0) {
-                try {
-                    timeout = Integer.parseInt(value) * 1000;
-                } catch (Exception e) {
-                }
-            }
-        }
-
-        return timeout;
-    }
-
     public void destroy() {
         for (Invoker<?> invoker : invokers) {
             if (invoker != null) {
diff --git a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java
@@ -133,7 +133,7 @@ public void destroy() {
                 }
                 for (ExchangeClient client : clients) {
                     try {
-                        client.close(getShutdownTimeout());
+                        client.close(ConfigUtils.getServerShutdownTimeout());
                     } catch (Throwable t) {
                         logger.warn(t.getMessage(), t);
                     }
@@ -144,25 +144,4 @@ public void destroy() {
             }
         }
     }
-
-    protected static int getShutdownTimeout() {
-        int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
-        String value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY);
-        if (value != null && value.length() > 0) {
-            try {
-                timeout = Integer.parseInt(value);
-            } catch (Exception e) {
-            }
-        } else {
-            value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_SECONDS_KEY);
-            if (value != null && value.length() > 0) {
-                try {
-                    timeout = Integer.parseInt(value) * 1000;
-                } catch (Exception e) {
-                }
-            }
-        }
-
-        return timeout;
-    }
 }
diff --git a/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/dubbo-rpc/dubbo-rpc-default/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java
@@ -19,6 +19,7 @@
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
+import com.alibaba.dubbo.common.utils.ConfigUtils;
 import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.dubbo.remoting.Channel;
@@ -373,7 +374,7 @@ public void destroy() {
                     if (logger.isInfoEnabled()) {
                         logger.info("Close dubbo server: " + server.getLocalAddress());
                     }
-                    server.close(getServerShutdownTimeout());
+                    server.close(ConfigUtils.getServerShutdownTimeout());
                 } catch (Throwable t) {
                     logger.warn(t.getMessage(), t);
                 }
@@ -387,7 +388,7 @@ public void destroy() {
                     if (logger.isInfoEnabled()) {
                         logger.info("Close dubbo connect: " + client.getLocalAddress() + "-->" + client.getRemoteAddress());
                     }
-                    client.close(getServerShutdownTimeout());
+                    client.close(ConfigUtils.getServerShutdownTimeout());
                 } catch (Throwable t) {
                     logger.warn(t.getMessage(), t);
                 }
@@ -401,7 +402,7 @@ public void destroy() {
                     if (logger.isInfoEnabled()) {
                         logger.info("Close dubbo connect: " + client.getLocalAddress() + "-->" + client.getRemoteAddress());
                     }
-                    client.close(getServerShutdownTimeout());
+                    client.close(ConfigUtils.getServerShutdownTimeout());
                 } catch (Throwable t) {
                     logger.warn(t.getMessage(), t);
                 }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void destroy() {`
`133`	`133`	`}`
`134`	`134`	`for (ExchangeClient client : clients) {`
`135`	`135`	`try {`
`136`		`- client.close(getShutdownTimeout());`
	`136`	`+ client.close(ConfigUtils.getServerShutdownTimeout());`
`137`	`137`	`} catch (Throwable t) {`
`138`	`138`	`logger.warn(t.getMessage(), t);`
`139`	`139`	`}`
`@@ -144,25 +144,4 @@ public void destroy() {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
`147`		`-`
`148`		`- protected static int getShutdownTimeout() {`
`149`		`- int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;`
`150`		`- String value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY);`
`151`		`- if (value != null && value.length() > 0) {`
`152`		`- try {`
`153`		`- timeout = Integer.parseInt(value);`
`154`		`- } catch (Exception e) {`
`155`		`- }`
`156`		`- } else {`
`157`		`- value = ConfigUtils.getProperty(Constants.SHUTDOWN_WAIT_SECONDS_KEY);`
`158`		`- if (value != null && value.length() > 0) {`
`159`		`- try {`
`160`		`- timeout = Integer.parseInt(value) * 1000;`
`161`		`- } catch (Exception e) {`
`162`		`- }`
`163`		`- }`
`164`		`- }`
`165`		`-`
`166`		`- return timeout;`
`167`		`- }`
`168`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import com.alibaba.dubbo.common.Constants;`
`20`	`20`	`import com.alibaba.dubbo.common.URL;`
`21`	`21`	`import com.alibaba.dubbo.common.extension.ExtensionLoader;`
	`22`	`+import com.alibaba.dubbo.common.utils.ConfigUtils;`
`22`	`23`	`import com.alibaba.dubbo.common.utils.NetUtils;`
`23`	`24`	`import com.alibaba.dubbo.common.utils.StringUtils;`
`24`	`25`	`import com.alibaba.dubbo.remoting.Channel;`
`@@ -373,7 +374,7 @@ public void destroy() {`
`373`	`374`	`if (logger.isInfoEnabled()) {`
`374`	`375`	`logger.info("Close dubbo server: " + server.getLocalAddress());`
`375`	`376`	`}`
`376`		`- server.close(getServerShutdownTimeout());`
	`377`	`+ server.close(ConfigUtils.getServerShutdownTimeout());`
`377`	`378`	`} catch (Throwable t) {`
`378`	`379`	`logger.warn(t.getMessage(), t);`
`379`	`380`	`}`
`@@ -387,7 +388,7 @@ public void destroy() {`
`387`	`388`	`if (logger.isInfoEnabled()) {`
`388`	`389`	`logger.info("Close dubbo connect: " + client.getLocalAddress() + "-->" + client.getRemoteAddress());`
`389`	`390`	`}`
`390`		`- client.close(getServerShutdownTimeout());`
	`391`	`+ client.close(ConfigUtils.getServerShutdownTimeout());`
`391`	`392`	`} catch (Throwable t) {`
`392`	`393`	`logger.warn(t.getMessage(), t);`
`393`	`394`	`}`
`@@ -401,7 +402,7 @@ public void destroy() {`
`401`	`402`	`if (logger.isInfoEnabled()) {`
`402`	`403`	`logger.info("Close dubbo connect: " + client.getLocalAddress() + "-->" + client.getRemoteAddress());`
`403`	`404`	`}`
`404`		`- client.close(getServerShutdownTimeout());`
	`405`	`+ client.close(ConfigUtils.getServerShutdownTimeout());`
`405`	`406`	`} catch (Throwable t) {`
`406`	`407`	`logger.warn(t.getMessage(), t);`
`407`	`408`	`}`