You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by cr...@apache.org on 2022/11/15 02:37:47 UTC
[dubbo] branch 3.1 updated: Revert #8755 (#10938)
This is an automated email from the ASF dual-hosted git repository.
crazyhzm pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 83bccc8b03 Revert #8755 (#10938)
83bccc8b03 is described below
commit 83bccc8b03f2d1c364e2d80840cb39f382610ce8
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Tue Nov 15 10:37:40 2022 +0800
Revert #8755 (#10938)
---
.../client/ServiceDiscoveryRegistryDirectory.java | 4 ++--
.../registry/integration/RegistryDirectory.java | 12 ++++++------
.../dubbo/remoting/exchange/ExchangeClient.java | 4 ----
.../src/main/java/org/apache/dubbo/rpc/Invoker.java | 7 -------
.../dubbo/rpc/protocol/dubbo/DubboInvoker.java | 20 +-------------------
.../protocol/dubbo/ReferenceCountExchangeClient.java | 17 +----------------
6 files changed, 10 insertions(+), 54 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
index fe98e100f4..b1415fe8de 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java
@@ -425,7 +425,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
if (localUrlInvokerMap != null) {
for (Invoker<T> invoker : new ArrayList<>(localUrlInvokerMap.values())) {
try {
- invoker.destroyAll();
+ invoker.destroy();
} catch (Throwable t) {
logger.warn(PROTOCOL_FAILED_DESTROY_INVOKER, "", "", "Failed to destroy service " + serviceKey + " to provider " + invoker.getUrl(), t);
}
@@ -458,7 +458,7 @@ public class ServiceDiscoveryRegistryDirectory<T> extends DynamicDirectory<T> {
Invoker<T> invoker = entry.getValue();
if (invoker != null) {
try {
- invoker.destroyAll();
+ invoker.destroy();
if (logger.isDebugEnabled()) {
logger.debug("destroy invoker[" + invoker.getUrl() + "] success. ");
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index 53fd6840fe..1c66500c61 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -62,13 +62,13 @@ import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.TAG_KEY;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_INIT_SERIALIZATION_OPTIMIZER;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_REFER_INVOKER;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_UNSUPPORTED;
+import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROXY_FAILED_CONVERT_URL;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_EMPTY_ADDRESS;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_FAILED_DESTROY_SERVICE;
import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_UNSUPPORTED_CATEGORY;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROXY_FAILED_CONVERT_URL;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_UNSUPPORTED;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_INIT_SERIALIZATION_OPTIMIZER;
-import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_REFER_INVOKER;
import static org.apache.dubbo.common.constants.RegistryConstants.APP_DYNAMIC_CONFIGURATORS_CATEGORY;
import static org.apache.dubbo.common.constants.RegistryConstants.COMPATIBLE_CONFIG_KEY;
import static org.apache.dubbo.common.constants.RegistryConstants.CONFIGURATORS_CATEGORY;
@@ -544,7 +544,7 @@ public class RegistryDirectory<T> extends DynamicDirectory<T> {
if (!CollectionUtils.isEmptyMap(localUrlInvokerMap)) {
for (Invoker<T> invoker : new ArrayList<>(localUrlInvokerMap.values())) {
try {
- invoker.destroyAll();
+ invoker.destroy();
} catch (Throwable t) {
// 1-15 - Failed to destroy service
logger.warn(REGISTRY_FAILED_DESTROY_SERVICE, "", "",
@@ -573,7 +573,7 @@ public class RegistryDirectory<T> extends DynamicDirectory<T> {
Invoker<T> invoker = entry.getValue();
if (invoker != null) {
try {
- invoker.destroyAll();
+ invoker.destroy();
if (logger.isDebugEnabled()) {
logger.debug("destroy invoker[" + invoker.getUrl() + "] success. ");
}
diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java
index 2fdf6a69a8..8ce3fac479 100644
--- a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java
+++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java
@@ -25,8 +25,4 @@ import org.apache.dubbo.remoting.Client;
*/
public interface ExchangeClient extends Client, ExchangeChannel {
- default void closeAll(int timeout) {
- close(timeout);
- }
-
}
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java
index bf6a6547da..6bf3a3a3ce 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java
@@ -43,11 +43,4 @@ public interface Invoker<T> extends Node {
*/
Result invoke(Invocation invocation) throws RpcException;
- /**
- * destroy all
- */
- default void destroyAll() {
- destroy();
- }
-
}
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
index 3fe1cddfe0..568740d1cf 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java
@@ -146,20 +146,6 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
@Override
public void destroy() {
- destroyInternal(false);
- }
-
- @Override
- public void destroyAll() {
- destroyInternal(true);
- }
-
- /**
- * when destroy unused invoker, closeAll should be true
- *
- * @param closeAll
- */
- private void destroyInternal(boolean closeAll) {
// in order to avoid closing a client multiple times, a counter is used in case of connection per jvm, every
// time when client.close() is called, counter counts down once, and when counter reaches zero, client will be
// closed.
@@ -176,11 +162,7 @@ public class DubboInvoker<T> extends AbstractInvoker<T> {
}
for (ExchangeClient client : clients) {
try {
- if (closeAll) {
- client.closeAll(serverShutdownTimeout);
- } else {
- client.close(serverShutdownTimeout);
- }
+ client.close(serverShutdownTimeout);
} catch (Throwable t) {
logger.warn(PROTOCOL_ERROR_CLOSE_CLIENT, "", "", t.getMessage(), t);
}
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
index 18eeceb2b0..22cc722cf0 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
@@ -159,22 +159,7 @@ final class ReferenceCountExchangeClient implements ExchangeClient {
@Override
public void close(int timeout) {
- closeInternal(timeout, false);
- }
-
- @Override
- public void closeAll(int timeout) {
- closeInternal(timeout, true);
- }
-
- /**
- * when destroy unused invoker, closeAll should be true
- *
- * @param timeout
- * @param closeAll
- */
- private void closeInternal(int timeout, boolean closeAll) {
- if (closeAll || referenceCount.decrementAndGet() <= 0) {
+ if (referenceCount.decrementAndGet() <= 0) {
if (timeout == 0) {
client.close();