From 4c7a9c8288ad7bae54d5ae9f2728a00b99f9ab13 Mon Sep 17 00:00:00 2001
From: shedfreewu <49236872+shedfreewu@users.noreply.github.com>
Date: Thu, 14 Mar 2024 21:18:51 +0800
Subject: [PATCH] feat: PolarisServiceRegistry#deregister support idempotency.
 (#1243)

---
 CHANGELOG.md                                         |  3 ++-
 .../polaris/registry/PolarisServiceRegistry.java     |  6 +++---
 .../plugin/lossless/LosslessRegistryAspect.java      | 12 +-----------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3363c658c..bf85b0ebf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # Change Log
 ---
 
-- [feat: support lossless register and deregister](https://github.com/Tencent/spring-cloud-tencent/issues/977)
+- [feat: support lossless register and deregister at #977](https://github.com/Tencent/spring-cloud-tencent/pull/1242)
+- [feat: PolarisServiceRegistry#deregister support idempotency.](https://github.com/Tencent/spring-cloud-tencent/pull/1243)
\ No newline at end of file
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
index 2d12ba7fd..d61034089 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@@ -175,7 +175,7 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 	public void deregister(PolarisRegistration registration) {
 		LOGGER.info("De-registering from Polaris Server now...");
 
-		if (StringUtils.isEmpty(registration.getServiceId())) {
+		if (StringUtils.isEmpty(registration.getServiceId()) || !PolarisSDKContextManager.isRegistered) {
 			LOGGER.warn("No dom to de-register for polaris client...");
 			return;
 		}
@@ -190,6 +190,8 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 		try {
 			ProviderAPI providerClient = polarisSDKContextManager.getProviderAPI();
 			providerClient.deRegister(deRegisterRequest);
+			PolarisSDKContextManager.isRegistered = false;
+			LOGGER.info("De-registration finished.");
 		}
 		catch (Exception e) {
 			LOGGER.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration, e);
@@ -198,8 +200,6 @@ public class PolarisServiceRegistry implements ServiceRegistry<PolarisRegistrati
 			if (null != heartbeatExecutor) {
 				heartbeatExecutor.shutdown();
 			}
-			LOGGER.info("De-registration finished.");
-			PolarisSDKContextManager.isRegistered = false;
 		}
 	}
 
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspect.java b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspect.java
index 1fb6ccb2d..248067616 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspect.java
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-tencent-lossless-plugin/src/main/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspect.java
@@ -17,8 +17,6 @@
 
 package com.tencent.cloud.plugin.lossless;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.tencent.cloud.plugin.lossless.config.LosslessProperties;
 import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
 import com.tencent.polaris.api.pojo.BaseInstance;
@@ -46,9 +44,6 @@ public class LosslessRegistryAspect {
 
 	private PolarisSDKContextManager polarisSDKContextManager;
 
-	private final AtomicBoolean doneDeregister = new AtomicBoolean(false);
-
-
 	public LosslessRegistryAspect(ServiceRegistry serviceRegistry, Registration registration,
 					LosslessProperties losslessProperties, PolarisSDKContextManager polarisSDKContextManager) {
 		this.serviceRegistry = serviceRegistry;
@@ -86,12 +81,7 @@ public class LosslessRegistryAspect {
 
 	@Around("deregisterPointcut()")
 	public Object invokeDeregister(ProceedingJoinPoint joinPoint) throws Throwable {
-		if (doneDeregister.compareAndSet(false, true)) {
-			return joinPoint.proceed();
-		}
-		else {
-			return null;
-		}
+		return joinPoint.proceed();
 	}
 
 	public void executeJoinPoint(ProceedingJoinPoint joinPoint) {