Fix #13027, persistent service instance changed without metadata event. (#13169)

KomachiSion · web-flow · commit 660a4f4b8821 · 2025-03-10T16:49:10.000+08:00
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/v2/service/impl/PersistentClientOperationServiceImpl.java b/naming/src/main/java/com/alibaba/nacos/naming/core/v2/service/impl/PersistentClientOperationServiceImpl.java
@@ -45,6 +45,7 @@
 import com.alibaba.nacos.naming.core.v2.client.impl.IpPortBasedClient;
 import com.alibaba.nacos.naming.core.v2.client.manager.impl.PersistentIpPortClientManager;
 import com.alibaba.nacos.naming.core.v2.event.client.ClientOperationEvent;
+import com.alibaba.nacos.naming.core.v2.event.metadata.MetadataEvent;
 import com.alibaba.nacos.naming.core.v2.pojo.InstancePublishInfo;
 import com.alibaba.nacos.naming.core.v2.pojo.Service;
 import com.alibaba.nacos.naming.core.v2.service.ClientOperationService;
@@ -223,8 +224,8 @@ public Response onApply(WriteRequest request) {
     }
     
     private boolean instanceAndServiceExist(InstanceStoreRequest instanceRequest) {
-        return clientManager.contains(instanceRequest.getClientId()) && clientManager
-                .getClient(instanceRequest.getClientId()).getAllPublishedService().contains(instanceRequest.service);
+        return clientManager.contains(instanceRequest.getClientId()) && clientManager.getClient(
+                instanceRequest.getClientId()).getAllPublishedService().contains(instanceRequest.service);
     }
     
     private void onInstanceRegister(Service service, Instance instance, String clientId) {
@@ -237,6 +238,8 @@ private void onInstanceRegister(Service service, Instance instance, String clien
         client.addServiceInstance(singleton, instancePublishInfo);
         client.setLastUpdatedTime();
         NotifyCenter.publishEvent(new ClientOperationEvent.ClientRegisterServiceEvent(singleton, clientId));
+        NotifyCenter.publishEvent(
+                new MetadataEvent.InstanceMetadataEvent(singleton, instancePublishInfo.getMetadataId(), false));
     }
     
     private void onInstanceDeregister(Service service, String clientId) {
@@ -246,12 +249,16 @@ private void onInstanceDeregister(Service service, String clientId) {
             Loggers.RAFT.warn("client not exist onInstanceDeregister, clientId : {} ", clientId);
             return;
         }
-        client.removeServiceInstance(singleton);
+        final InstancePublishInfo removedInstance = client.removeServiceInstance(singleton);
         client.setLastUpdatedTime();
         if (client.getAllPublishedService().isEmpty()) {
             clientManager.clientDisconnected(clientId);
         }
         NotifyCenter.publishEvent(new ClientOperationEvent.ClientDeregisterServiceEvent(singleton, clientId));
+        if (null != removedInstance) {
+            NotifyCenter.publishEvent(
+                    new MetadataEvent.InstanceMetadataEvent(singleton, removedInstance.getMetadataId(), true));
+        }
     }
     
     @Override
@@ -333,8 +340,8 @@ protected boolean readSnapshot(Reader reader) throws Exception {
             final Checksum checksum = new CRC64();
             byte[] snapshotBytes = DiskUtils.decompress(sourceFile, checksum);
             LocalFileMeta fileMeta = reader.getFileMeta(SNAPSHOT_ARCHIVE);
-            if (fileMeta.getFileMeta().containsKey(CHECK_SUM_KEY) && !Objects
-                    .equals(Long.toHexString(checksum.getValue()), fileMeta.get(CHECK_SUM_KEY))) {
+            if (fileMeta.getFileMeta().containsKey(CHECK_SUM_KEY) && !Objects.equals(
+                    Long.toHexString(checksum.getValue()), fileMeta.get(CHECK_SUM_KEY))) {
                 throw new IllegalArgumentException("Snapshot checksum failed");
             }
             loadSnapshot(snapshotBytes);
@@ -368,7 +375,7 @@ protected void loadSnapshot(byte[] snapshotBytes) {
             // remove dead client
             removeDeadClient(newData.keySet(), oldClientIds);
         }
-
+        
         /**
          * update instance info for client.
          *
@@ -399,13 +406,15 @@ private void updateSyncDataToClient(Map.Entry<String, ClientSyncData> entry, IpP
                     InstancePublishInfo oldInstanceInfo = client.getInstancePublishInfo(singleton);
                     if (oldInstanceInfo != null && !newInstanceInfo.equals(oldInstanceInfo)) {
                         client.putServiceInstance(singleton, newInstanceInfo);
-                        NotifyCenter.publishEvent(new ClientOperationEvent.ClientRegisterServiceEvent(singleton, client.getClientId()));
+                        NotifyCenter.publishEvent(
+                                new ClientOperationEvent.ClientRegisterServiceEvent(singleton, client.getClientId()));
                         Loggers.RAFT.info("[SNAPSHOT-DATA-UPDATE] service={}, instance={}", service, newInstanceInfo);
                     }
                 } else {
                     // add
                     client.putServiceInstance(singleton, newInstanceInfo);
-                    NotifyCenter.publishEvent(new ClientOperationEvent.ClientRegisterServiceEvent(singleton, client.getClientId()));
+                    NotifyCenter.publishEvent(
+                            new ClientOperationEvent.ClientRegisterServiceEvent(singleton, client.getClientId()));
                     Loggers.RAFT.info("[SNAPSHOT-DATA-ADD] service={}, instance={}", service, newInstanceInfo);
                 }
             }
@@ -415,12 +424,13 @@ private void updateSyncDataToClient(Map.Entry<String, ClientSyncData> entry, IpP
                     InstancePublishInfo oldInfo = client.getInstancePublishInfo(service);
                     // metric ip count decrement
                     client.removeServiceInstance(service);
-                    NotifyCenter.publishEvent(new ClientOperationEvent.ClientDeregisterServiceEvent(service, client.getClientId()));
+                    NotifyCenter.publishEvent(
+                            new ClientOperationEvent.ClientDeregisterServiceEvent(service, client.getClientId()));
                     Loggers.RAFT.info("[SNAPSHOT-DATA-REMOVE] service={}, instance={}", service, oldInfo);
                 }
             }
         }
-
+        
         /**
          * remove certain client which has dead.
          *
@@ -444,7 +454,9 @@ private void removeDeadClient(Collection<String> aliveClientIds, Collection<Stri
                                 InstancePublishInfo oldInfo = client.getInstancePublishInfo(service);
                                 // metric ip count decrement
                                 client.removeServiceInstance(service);
-                                NotifyCenter.publishEvent(new ClientOperationEvent.ClientDeregisterServiceEvent(singleton, client.getClientId()));
+                                NotifyCenter.publishEvent(
+                                        new ClientOperationEvent.ClientDeregisterServiceEvent(singleton,
+                                                client.getClientId()));
                                 Loggers.RAFT.info("[SNAPSHOT-DATA-REMOVE] service={}, instance={}", singleton, oldInfo);
                             }
                         }
