Fix zookeeper instance update (apache#11212)

wuwen5 · Dec 29, 2022 · e86e6e3 · e86e6e3
1 parent 1ecc00a
commit e86e6e3
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/...ookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java b/...ookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscovery.java
@@ -42,6 +42,8 @@
 
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.REGISTRY_ZOOKEEPER_EXCEPTION;
 import static org.apache.dubbo.common.function.ThrowableFunction.execute;
+import static org.apache.dubbo.metadata.RevisionResolver.EMPTY_REVISION;
+import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils.getExportedServicesRevision;
 import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkUtils.build;
 import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkUtils.buildCuratorFramework;
 import static org.apache.dubbo.registry.zookeeper.util.CuratorFrameworkUtils.buildServiceDiscovery;
@@ -106,6 +108,19 @@ public void doUnregister(ServiceInstance serviceInstance) throws RuntimeExceptio
         }
     }
 
+    @Override
+    protected void doUpdate(ServiceInstance serviceInstance) throws RuntimeException {
+        if (!EMPTY_REVISION.equals(getExportedServicesRevision(serviceInstance))) {
+            reportMetadata(serviceInstance.getServiceMetadata());
+        }
+
+        try {
+            serviceDiscovery.updateService(build(serviceInstance));
+        } catch (Exception e) {
+            throw new RpcException(REGISTRY_EXCEPTION, "Failed register instance " + serviceInstance.toString(), e);
+        }
+    }
+
     @Override
     public Set<String> getServices() {
         return doInServiceDiscovery(s -> new LinkedHashSet<>(s.queryForNames()));