You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/12/12 08:25:30 UTC

[dubbo] branch 3.2 updated (9508acdbd8 -> ab10b8a189)

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


    from 9508acdbd8 Fix triple default version (#11068)
     add 031016ec60 Add refresh system properties logic (#11086)
     add 92420d1f1a fix diagnostics log message errors (#11103)
     add 8d6c4fdedb Fix MetadataReportConfig being valid when pre config (#11110)
     add 1ddf574864 Fix dubbo.reference not work in 3.x (#11109)
     add e3ee0cc689 Fix TimeoutCountDown objects being passed through and support for method-level configuration of cut-off timeout-count (#11120)
     new ab10b8a189 Merge branch 'apache-3.1' into apache-3.2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../filter/support/ConsumerContextFilter.java      |  23 +++--
 .../dubbo/common/compiler/support/JdkCompiler.java |   3 +-
 .../apache/dubbo/common/config/Environment.java    |   2 +-
 .../dubbo/common/config/SystemConfiguration.java   |  35 ++++++-
 .../org/apache/dubbo/config/AbstractConfig.java    |  91 ++++++++---------
 .../apache/dubbo/config/ReferenceConfigBase.java   |   3 +
 .../org/apache/dubbo/config/ServiceConfigBase.java |   3 +
 .../apache/dubbo/config/context/ConfigManager.java |   1 -
 .../common/config/SystemConfigurationTest.java     |   5 +-
 .../dubbo/config/context/ConfigManagerTest.java    |  21 +++-
 .../config/deploy/DefaultApplicationDeployer.java  | 110 ++++++++++++++-------
 .../dubbo/config/utils/ConfigValidationUtils.java  |  15 ++-
 .../dubbo/config/bootstrap/MultiInstanceTest.java  |   2 +-
 .../metadata/report/MetadataReportInstance.java    |   4 +-
 .../java/org/apache/dubbo/rpc/RpcInvocation.java   |   5 +-
 .../org/apache/dubbo/rpc/filter/ContextFilter.java |   2 +-
 .../org/apache/dubbo/rpc/filter/TimeoutFilter.java |   2 +-
 .../dubbo/rpc/protocol/dubbo/DubboInvoker.java     |   4 +-
 .../dubbo/rpc/protocol/injvm/InjvmInvoker.java     |   4 +-
 .../dubbo/rpc/protocol/tri/TripleInvoker.java      |   4 +-
 20 files changed, 229 insertions(+), 110 deletions(-)


[dubbo] 01/01: Merge branch 'apache-3.1' into apache-3.2

Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit ab10b8a1893e891d74fe17095c4502ed2f3dbb83
Merge: 9508acdbd8 e3ee0cc689
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Mon Dec 12 16:24:01 2022 +0800

    Merge branch 'apache-3.1' into apache-3.2
    
    # Conflicts:
    #       dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java

 .../filter/support/ConsumerContextFilter.java      |  23 +++--
 .../dubbo/common/compiler/support/JdkCompiler.java |   3 +-
 .../apache/dubbo/common/config/Environment.java    |   2 +-
 .../dubbo/common/config/SystemConfiguration.java   |  35 ++++++-
 .../org/apache/dubbo/config/AbstractConfig.java    |  91 ++++++++---------
 .../apache/dubbo/config/ReferenceConfigBase.java   |   3 +
 .../org/apache/dubbo/config/ServiceConfigBase.java |   3 +
 .../apache/dubbo/config/context/ConfigManager.java |   1 -
 .../common/config/SystemConfigurationTest.java     |   5 +-
 .../dubbo/config/context/ConfigManagerTest.java    |  21 +++-
 .../config/deploy/DefaultApplicationDeployer.java  | 110 ++++++++++++++-------
 .../dubbo/config/utils/ConfigValidationUtils.java  |  15 ++-
 .../dubbo/config/bootstrap/MultiInstanceTest.java  |   2 +-
 .../metadata/report/MetadataReportInstance.java    |   4 +-
 .../java/org/apache/dubbo/rpc/RpcInvocation.java   |   5 +-
 .../org/apache/dubbo/rpc/filter/ContextFilter.java |   2 +-
 .../org/apache/dubbo/rpc/filter/TimeoutFilter.java |   2 +-
 .../dubbo/rpc/protocol/dubbo/DubboInvoker.java     |   4 +-
 .../dubbo/rpc/protocol/injvm/InjvmInvoker.java     |   4 +-
 .../dubbo/rpc/protocol/tri/TripleInvoker.java      |   4 +-
 20 files changed, 229 insertions(+), 110 deletions(-)

diff --cc dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/ConsumerContextFilter.java
index fe78983f58,e7069ae139..00c5a8e923
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/ConsumerContextFilter.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/ConsumerContextFilter.java
@@@ -95,16 -99,25 +98,24 @@@ public class ConsumerContextFilter impl
              }
  
              // pass default timeout set by end user (ReferenceConfig)
-             Object countDown = context.getObjectAttachment(TIME_COUNTDOWN_KEY);
+             Object countDown = RpcContext.getServerAttachment().getObjectAttachment(TIME_COUNTDOWN_KEY);
              if (countDown != null) {
-                 TimeoutCountDown timeoutCountDown = (TimeoutCountDown) countDown;
-                 if (timeoutCountDown.isExpired()) {
-                     return AsyncRpcResult.newDefaultAsyncResult(new RpcException(RpcException.TIMEOUT_TERMINATE,
-                         "No time left for making the following call: " + invocation.getServiceName() + "."
-                             + invocation.getMethodName() + ", terminate directly."), invocation);
+                 String methodName = RpcUtils.getMethodName(invocation);
+                 // When the client has enabled the timeout-countdown function,
+                 // the subsequent calls launched by the Server side will be enabled by default,
+                 // and support to turn off the function on a node to get rid of the timeout control.
+                 if (invoker.getUrl().getMethodParameter(methodName, ENABLE_TIMEOUT_COUNTDOWN_KEY, true)) {
+                     context.setObjectAttachment(TIMEOUT_ATTACHMENT_KEY, countDown);
+ 
+                     TimeoutCountDown timeoutCountDown = (TimeoutCountDown) countDown;
+                     if (timeoutCountDown.isExpired()) {
+                         return AsyncRpcResult.newDefaultAsyncResult(new RpcException(RpcException.TIMEOUT_TERMINATE,
+                             "No time left for making the following call: " + invocation.getServiceName() + "."
+                                 + invocation.getMethodName() + ", terminate directly."), invocation);
+                     }
                  }
              }
 -
 -            RpcContext.removeServerContext();
 +            RpcContext.removeClientResponseContext();
              return invoker.invoke(invocation);
          } finally {
              RpcContext.restoreServiceContext(originServiceContext);
diff --cc dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
index 6f50193e7f,3411789c09..04f1ef0ed0
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
@@@ -78,12 -76,11 +81,12 @@@ import static java.lang.String.format
  import static org.apache.dubbo.common.config.ConfigurationUtils.parseProperties;
  import static org.apache.dubbo.common.constants.CommonConstants.REGISTRY_SPLIT_PATTERN;
  import static org.apache.dubbo.common.constants.CommonConstants.REMOTE_METADATA_STORAGE_TYPE;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REFRESH_INSTANCE_ERROR;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REGISTER_INSTANCE_ERROR;
- import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_START_MODEL;
  import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_EXECUTE_DESTORY;
  import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_INIT_CONFIG_CENTER;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_START_MODEL;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REFRESH_INSTANCE_ERROR;
+ import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REGISTER_INSTANCE_ERROR;
 +import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS;
  import static org.apache.dubbo.common.utils.StringUtils.isEmpty;
  import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty;
  import static org.apache.dubbo.metadata.MetadataConstants.DEFAULT_METADATA_PUBLISH_DELAY;
diff --cc dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
index 7ad8bce6c5,fbd89717b1..be582347fb
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
@@@ -317,6 -316,9 +317,8 @@@ public class TripleInvoker<T> extends A
              invocation.setObjectAttachment(TIMEOUT_ATTACHMENT_KEY,
                  timeout);// pass timeout to remote server
          }
+ 
+         invocation.getObjectAttachments().remove(TIME_COUNTDOWN_KEY);
          return timeout;
      }
 -
  }