You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ky...@apache.org on 2021/08/31 07:36:21 UTC

[dubbo] branch 3.0-multi-instances updated (2bf74de -> 7e1f236)

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

kylixs pushed a change to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


    from 2bf74de  Fix scope model of reference/service model
     new 4b62418  Revert CallbackServiceCodec for dev
     new 8502691  Fix scope model NPE
     new 7e1f236  Fix consumer url NPE

The 3 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:
 .../org/apache/dubbo/rpc/model/ConsumerModel.java  |  5 ++---
 .../org/apache/dubbo/rpc/model/ProviderModel.java  |  5 ++---
 .../org/apache/dubbo/rpc/model/ServiceModel.java   | 12 ++++-------
 .../apache/dubbo/rpc/model/ServiceRepository.java  |  4 ++--
 .../org/apache/dubbo/config/ReferenceConfig.java   |  2 +-
 .../org/apache/dubbo/config/ServiceConfig.java     |  1 -
 .../dubbo/registry/client/InstanceAddressURL.java  |  7 +++++--
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   | 23 ++++------------------
 8 files changed, 20 insertions(+), 39 deletions(-)

[dubbo] 01/03: Revert CallbackServiceCodec for dev

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

kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 4b624186bace89c66929da577b2600cad91a5735
Author: gongdewei <ky...@qq.com>
AuthorDate: Tue Aug 31 12:28:45 2021 +0800

    Revert CallbackServiceCodec for dev
---
 .../rpc/protocol/dubbo/CallbackServiceCodec.java   | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
index 7386d0f..deaeec9 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java
@@ -16,7 +16,6 @@
  */
 package org.apache.dubbo.rpc.protocol.dubbo;
 
-import org.apache.dubbo.common.BaseServiceMetadata;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.bytecode.Wrapper;
 import org.apache.dubbo.common.extension.ExtensionLoader;
@@ -34,11 +33,7 @@ import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.Protocol;
 import org.apache.dubbo.rpc.ProxyFactory;
 import org.apache.dubbo.rpc.RpcInvocation;
-import org.apache.dubbo.rpc.model.ModuleModel;
-import org.apache.dubbo.rpc.model.ProviderModel;
 import org.apache.dubbo.rpc.model.ScopeModelUtil;
-import org.apache.dubbo.rpc.model.ServiceDescriptor;
-import org.apache.dubbo.rpc.model.ServiceMetadata;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -98,7 +93,7 @@ class CallbackServiceCodec {
      * @throws IOException
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
-    private static String exportOrUnexportCallbackService(Channel channel, RpcInvocation inv, URL url, Class clazz, Object inst, Boolean export) throws IOException {
+    private static String exportOrUnexportCallbackService(Channel channel, URL url, Class clazz, Object inst, Boolean export) throws IOException {
         int instid = System.identityHashCode(inst);
 
         Map<String, String> params = new HashMap<>(3);
@@ -134,17 +129,7 @@ class CallbackServiceCodec {
             // one channel can have multiple callback instances, no need to re-export for different instance.
             if (!channel.hasAttribute(cacheKey)) {
                 if (!isInstancesOverLimit(channel, url, clazz.getName(), instid, false)) {
-                    ModuleModel moduleModel = inv.getServiceModel().getModuleModel();
-                    ServiceDescriptor serviceDescriptor = ScopeModelUtil.getApplicationModel(moduleModel).getApplicationServiceRepository().registerService(clazz);
-                    ProviderModel providerModel = new ProviderModel(BaseServiceMetadata.buildServiceKey(exportUrl.getPath(), group, exportUrl.getVersion()),
-                        inst,
-                        serviceDescriptor,
-                        moduleModel,
-                        null,
-                        new ServiceMetadata(clazz.getName() + "." + instid, exportUrl.getGroup(), exportUrl.getVersion(), clazz));
-                    moduleModel.getApplicationModel().getApplicationServiceRepository().registerProvider(providerModel);
-                    exportUrl = exportUrl.setScopeModel(moduleModel);
-                    exportUrl = exportUrl.setServiceModel(providerModel);
+                    ScopeModelUtil.getApplicationModel(url.getScopeModel()).getApplicationServiceRepository().registerService(clazz);
                     Invoker<?> invoker = PROXY_FACTORY.getInvoker(inst, clazz, exportUrl);
                     // should destroy resource?
                     Exporter<?> exporter = PROTOCOL.export(invoker);
@@ -291,10 +276,10 @@ class CallbackServiceCodec {
         Class<?>[] pts = inv.getParameterTypes();
         switch (callbackStatus) {
             case CallbackServiceCodec.CALLBACK_CREATE:
-                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, exportOrUnexportCallbackService(channel, inv,  url, pts[paraIndex], args[paraIndex], true));
+                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, exportOrUnexportCallbackService(channel, url, pts[paraIndex], args[paraIndex], true));
                 return null;
             case CallbackServiceCodec.CALLBACK_DESTROY:
-                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, exportOrUnexportCallbackService(channel, inv,  url, pts[paraIndex], args[paraIndex], false));
+                inv.setAttachment(INV_ATT_CALLBACK_KEY + paraIndex, exportOrUnexportCallbackService(channel, url, pts[paraIndex], args[paraIndex], false));
                 return null;
             default:
                 return args[paraIndex];

[dubbo] 02/03: Fix scope model NPE

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

kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 8502691b6e3df5e58f5d7742e6a56663a46bf464
Author: gongdewei <ky...@qq.com>
AuthorDate: Tue Aug 31 14:51:21 2021 +0800

    Fix scope model NPE
---
 .../main/java/org/apache/dubbo/rpc/model/ConsumerModel.java  |  5 ++---
 .../main/java/org/apache/dubbo/rpc/model/ProviderModel.java  |  5 ++---
 .../main/java/org/apache/dubbo/rpc/model/ServiceModel.java   | 12 ++++--------
 .../java/org/apache/dubbo/rpc/model/ServiceRepository.java   |  4 ++--
 .../main/java/org/apache/dubbo/config/ReferenceConfig.java   |  2 +-
 .../src/main/java/org/apache/dubbo/config/ServiceConfig.java |  1 -
 6 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
index 701a228..f6df44d 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
@@ -52,7 +52,7 @@ public class ConsumerModel extends ServiceModel {
                          ReferenceConfigBase<?> referenceConfig,
                          Map<String, AsyncMethodInfo> methodConfigs) {
 
-        super(proxyObject, serviceKey, serviceModel, referenceConfig.getScopeModel(), referenceConfig);
+        super(proxyObject, serviceKey, serviceModel, referenceConfig);
         Assert.notEmptyString(serviceKey, "Service name can't be null or blank");
 
         this.methodConfigs = methodConfigs == null ? new HashMap<>() : methodConfigs;
@@ -63,10 +63,9 @@ public class ConsumerModel extends ServiceModel {
                          ServiceDescriptor serviceModel,
                          ReferenceConfigBase<?> referenceConfig,
                          ServiceMetadata metadata,
-                         ModuleModel moduleModel,
                          Map<String, AsyncMethodInfo> methodConfigs) {
 
-        super(proxyObject, serviceKey, serviceModel, moduleModel, referenceConfig, metadata);
+        super(proxyObject, serviceKey, serviceModel, referenceConfig, metadata);
         Assert.notEmptyString(serviceKey, "Service name can't be null or blank");
 
         this.methodConfigs = methodConfigs == null ? new HashMap<>() : methodConfigs;
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
index 9b0d25b..2aab894 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
@@ -38,7 +38,7 @@ public class ProviderModel extends ServiceModel {
                          Object serviceInstance,
                          ServiceDescriptor serviceModel,
                          ServiceConfigBase<?> serviceConfig) {
-        super(serviceInstance, serviceKey, serviceModel, serviceConfig.getScopeModel(), serviceConfig);
+        super(serviceInstance, serviceKey, serviceModel, serviceConfig);
         if (null == serviceInstance) {
             throw new IllegalArgumentException("Service[" + serviceKey + "]Target is NULL.");
         }
@@ -49,10 +49,9 @@ public class ProviderModel extends ServiceModel {
     public ProviderModel(String serviceKey,
                          Object serviceInstance,
                          ServiceDescriptor serviceModel,
-                         ModuleModel moduleModel,
                          ServiceConfigBase<?> serviceConfig,
                          ServiceMetadata serviceMetadata) {
-        super(serviceInstance, serviceKey, serviceModel, moduleModel, serviceConfig, serviceMetadata);
+        super(serviceInstance, serviceKey, serviceModel, serviceConfig, serviceMetadata);
         if (null == serviceInstance) {
             throw new IllegalArgumentException("Service[" + serviceKey + "]Target is NULL.");
         }
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
index c70d43f..92c6fdc 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
@@ -33,19 +33,15 @@ public class ServiceModel {
 
     private ServiceMetadata serviceMetadata;
 
-    public ServiceModel(Object proxyObject, String serviceKey, ServiceDescriptor serviceModel, ModuleModel moduleModel, AbstractInterfaceConfig config) {
-        this.proxyObject = proxyObject;
-        this.serviceKey = serviceKey;
-        this.serviceModel = serviceModel;
-        this.moduleModel = moduleModel;
-        this.config = config;
+    public ServiceModel(Object proxyObject, String serviceKey, ServiceDescriptor serviceModel, AbstractInterfaceConfig config) {
+        this(proxyObject, serviceKey, serviceModel, config, null);
     }
 
-    public ServiceModel(Object proxyObject, String serviceKey, ServiceDescriptor serviceModel, ModuleModel moduleModel, AbstractInterfaceConfig config, ServiceMetadata serviceMetadata) {
+    public ServiceModel(Object proxyObject, String serviceKey, ServiceDescriptor serviceModel, AbstractInterfaceConfig config, ServiceMetadata serviceMetadata) {
         this.proxyObject = proxyObject;
         this.serviceKey = serviceKey;
         this.serviceModel = serviceModel;
-        this.moduleModel = moduleModel;
+        this.moduleModel = ScopeModelUtil.getModuleModel(config != null ? config.getScopeModel() : null);
         this.config = config;
         this.serviceMetadata = serviceMetadata;
     }
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
index 8d605f8..c136593 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ServiceRepository.java
@@ -111,7 +111,7 @@ public class ServiceRepository extends LifecycleAdapter implements FrameworkExt,
                                  Object proxy,
                                  ServiceMetadata serviceMetadata) {
         ConsumerModel consumerModel = new ConsumerModel(serviceMetadata.getServiceKey(), proxy, serviceDescriptor, rc,
-            serviceMetadata, rc.getScopeModel(), null);
+            serviceMetadata, null);
         consumers.putIfAbsent(serviceKey, consumerModel);
     }
 
@@ -132,7 +132,7 @@ public class ServiceRepository extends LifecycleAdapter implements FrameworkExt,
                                  ServiceDescriptor serviceModel,
                                  ServiceConfigBase<?> serviceConfig,
                                  ServiceMetadata serviceMetadata) {
-        ProviderModel providerModel = new ProviderModel(serviceKey, serviceInstance, serviceModel, serviceConfig.getScopeModel(),
+        ProviderModel providerModel = new ProviderModel(serviceKey, serviceInstance, serviceModel,
             serviceConfig, serviceMetadata);
         providers.putIfAbsent(serviceKey, providerModel);
         providersWithoutGroup.putIfAbsent(keyWithoutGroup(serviceKey), providerModel);
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 9359e38..171745f 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -260,7 +260,7 @@ public class ReferenceConfig<T> extends ReferenceConfigBase<T> {
         ServiceRepository repository = getApplicationModel().getApplicationServiceRepository();
         ServiceDescriptor serviceDescriptor = repository.registerService(interfaceClass);
         consumerModel = new ConsumerModel(serviceMetadata.getServiceKey(), proxy, serviceDescriptor, this,
-            serviceMetadata, getScopeModel(), createAsyncMethodInfo());
+            serviceMetadata, createAsyncMethodInfo());
 
         repository.registerConsumer(consumerModel);
 
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index 0d7cc3c..8423ef0 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -361,7 +361,6 @@ public class ServiceConfig<T> extends ServiceConfigBase<T> {
         providerModel = new ProviderModel(getUniqueServiceName(),
             ref,
             serviceDescriptor,
-            getScopeModel(),
             this,
             serviceMetadata);
 

[dubbo] 03/03: Fix consumer url NPE

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

kylixs pushed a commit to branch 3.0-multi-instances
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 7e1f2361262f199c79a4dcb21c8797fcbd914608
Author: gongdewei <ky...@qq.com>
AuthorDate: Tue Aug 31 15:33:19 2021 +0800

    Fix consumer url NPE
---
 .../java/org/apache/dubbo/registry/client/InstanceAddressURL.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java
index 506dcd2..fb41ba7 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java
@@ -22,6 +22,7 @@ import org.apache.dubbo.common.url.component.URLParam;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.metadata.MetadataInfo;
 import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.ScopeModel;
 import org.apache.dubbo.rpc.model.ServiceModel;
 
@@ -395,12 +396,14 @@ public class InstanceAddressURL extends URL {
 
     @Override
     public ScopeModel getScopeModel() {
-        return RpcContext.getServiceContext().getConsumerUrl().getScopeModel();
+        URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl();
+        return consumerUrl != null ? consumerUrl.getScopeModel() : ApplicationModel.defaultModel().getDefaultModule();
     }
 
     @Override
     public ServiceModel getServiceModel() {
-        return RpcContext.getServiceContext().getConsumerUrl().getServiceModel();
+        URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl();
+        return consumerUrl != null ? consumerUrl.getServiceModel() : null;
     }
 
     @Override