Fix notify

AlbumenJ · Sep 29, 2024 · 69655d1 · 69655d1
1 parent 86fa382
commit 69655d1
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/...java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java b/...java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@ -182,28 +182,8 @@ private synchronized void doOnEvent(ServiceInstancesChangedEvent event) {
         }
 
         int emptyNum = hasEmptyMetadata(revisionToInstances);
-        if (emptyNum != 0) { // retry every 10 seconds
+        if (emptyNum != 0) {
             hasEmptyMetadata = true;
-            if (retryPermission.tryAcquire()) {
-                if (retryFuture != null && !retryFuture.isDone()) {
-                    // cancel last retryFuture because only one retryFuture will be canceled at destroy().
-                    retryFuture.cancel(true);
-                }
-                try {
-                    retryFuture = scheduler.schedule(
-                            new AddressRefreshRetryTask(retryPermission, event.getServiceName()),
-                            10_000L,
-                            TimeUnit.MILLISECONDS);
-                } catch (Exception e) {
-                    logger.error(
-                            INTERNAL_ERROR,
-                            "unknown error in registry module",
-                            "",
-                            "Error submitting async retry task.");
-                }
-                logger.warn(
-                        INTERNAL_ERROR, "unknown error in registry module", "", "Address refresh try task submitted");
-            }
 
             // return if all metadata is empty, this notification will not take effect.
             if (emptyNum == revisionToInstances.size()) {
@@ -214,10 +194,12 @@ private synchronized void doOnEvent(ServiceInstancesChangedEvent event) {
                         "",
                         "Address refresh failed because of Metadata Server failure, wait for retry or new address refresh event.");
 
+                submitRetryTask(event);
                 return;
             }
+        } else {
+            hasEmptyMetadata = false;
         }
-        hasEmptyMetadata = false;
 
         Map<String, Map<Integer, Map<Set<String>, Object>>> protocolRevisionsToUrls = new HashMap<>();
         Map<String, List<ProtocolServiceKeyWithUrls>> newServiceUrls = new HashMap<>();
@@ -241,6 +223,34 @@ private synchronized void doOnEvent(ServiceInstancesChangedEvent event) {
 
         this.serviceUrls = newServiceUrls;
         this.notifyAddressChanged();
+
+        if (hasEmptyMetadata) {
+            submitRetryTask(event);
+        }
+    }
+
+    private void submitRetryTask(ServiceInstancesChangedEvent event) {
+        // retry every 10 seconds
+        if (retryPermission.tryAcquire()) {
+            if (retryFuture != null && !retryFuture.isDone()) {
+                // cancel last retryFuture because only one retryFuture will be canceled at destroy().
+                retryFuture.cancel(true);
+            }
+            try {
+                retryFuture = scheduler.schedule(
+                        new AddressRefreshRetryTask(retryPermission, event.getServiceName()),
+                        10_000L,
+                        TimeUnit.MILLISECONDS);
+            } catch (Exception e) {
+                logger.error(
+                        INTERNAL_ERROR,
+                        "unknown error in registry module",
+                        "",
+                        "Error submitting async retry task.");
+            }
+            logger.warn(
+                    INTERNAL_ERROR, "unknown error in registry module", "", "Address refresh try task submitted");
+        }
     }
 
     public synchronized void addListenerAndNotify(URL url, NotifyListener listener) {

diff --git a/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java b/...o-registry-api/src/main/java/org/apache/dubbo/registry/client/metadata/MetadataUtils.java
@@ -166,7 +166,6 @@ public static MetadataInfo getRemoteMetadata(
         ServiceInstance instance = selectInstance(instances);
         String metadataType = ServiceInstanceMetadataUtils.getMetadataStorageType(instance);
         MetadataInfo metadataInfo;
-        boolean interrupted = Thread.currentThread().isInterrupted();
         try {
             if (logger.isDebugEnabled()) {
                 logger.debug("Instance " + instance.getAddress() + " is using metadata type " + metadataType);
@@ -194,14 +193,6 @@ public static MetadataInfo getRemoteMetadata(
                             + " from instance " + instance.getAddress(),
                     e);
             metadataInfo = null;
-        } finally {
-            logger.info("After getting metadata from instance " + instance.getAddress() + ", interrupted status for "
-                    + Thread.currentThread().getName() + " is " + Thread.interrupted() + ". "
-                    + "If it was interrupted, this may caused by Metadata fetch timeout.");
-            if (interrupted) {
-                logger.info("Resetting interrupted status for " + Thread.currentThread().getName() + " to true due to "
-                        + "previous interrupted status.");
-            }
         }
 
         if (metadataInfo == null) {