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 2021/09/27 11:25:10 UTC

[dubbo] branch 3.0 updated: Add volatile modifier to AbstractServiceDiscovery#serviceInstance (#8915)

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

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


The following commit(s) were added to refs/heads/3.0 by this push:
     new 4f4e87b  Add volatile modifier to AbstractServiceDiscovery#serviceInstance (#8915)
4f4e87b is described below

commit 4f4e87b426f59e67c32eac56c5dc7513d73f03b2
Author: 灼华 <43...@users.noreply.github.com>
AuthorDate: Mon Sep 27 19:25:00 2021 +0800

    Add volatile modifier to AbstractServiceDiscovery#serviceInstance (#8915)
    
    1.add volatile
    2.log level
---
 .../org/apache/dubbo/registry/client/AbstractServiceDiscovery.java  | 2 +-
 .../registry/client/metadata/ServiceInstanceMetadataUtils.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
index 5f3ba63..0c606be 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
@@ -26,7 +26,7 @@ public abstract class AbstractServiceDiscovery implements ServiceDiscovery {
 
     private volatile boolean isDestroy;
 
-    protected ServiceInstance serviceInstance;
+    protected volatile ServiceInstance serviceInstance;
 
     @Override
     public final ServiceInstance getLocalInstance() {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
index 21be5e1..f7c551d 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/ServiceInstanceMetadataUtils.java
@@ -254,9 +254,9 @@ public class ServiceInstanceMetadataUtils {
                 ServiceInstance serviceInstanceForRegistry = new DefaultServiceInstance((DefaultServiceInstance) serviceInstance);
                 calInstanceRevision(serviceDiscovery, serviceInstanceForRegistry);
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.info("Start registering instance address to registry" + serviceDiscovery.getUrl() + ", instance " + serviceInstanceForRegistry);
+                    LOGGER.debug("Start registering instance address to registry" + serviceDiscovery.getUrl() + ", instance " + serviceInstanceForRegistry);
                 }
-                // register metadata
+                // register service instance
                 serviceDiscovery.register(serviceInstanceForRegistry);
             });
         }
@@ -285,7 +285,7 @@ public class ServiceInstanceMetadataUtils {
                 instance.getOrDefaultApplicationModel().getExtensionLoader(ServiceInstanceCustomizer.class);
         // FIXME, sort customizer before apply
         loader.getSupportedExtensionInstances().forEach(customizer -> {
-            // customizes
+            // customize
             customizer.customize(instance);
         });
     }