fix cacheData race (nacos-group#642)

Author: binbin0325

clients/config_client/config_client.go

@@ -24,22 +24,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pkg/errors"
-
-	"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"
-
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/kms"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients/cache"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients/nacos_client"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/logger"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/monitor"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/nacos_error"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_request"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/remote/rpc/rpc_response"
 	"github.com/nacos-group/nacos-sdk-go/v2/inner/uuid"
 	"github.com/nacos-group/nacos-sdk-go/v2/model"
 	"github.com/nacos-group/nacos-sdk-go/v2/util"
 	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -84,6 +82,7 @@ type cacheDataListener struct {
 
 func (cacheData *cacheData) executeListener() {
 	cacheData.cacheDataListener.lastMd5 = cacheData.md5
+	cacheData.configClient.cacheMap.Set(util.GetConfigCacheKey(cacheData.dataId, cacheData.group, cacheData.tenant), *cacheData)
 
 	decryptedContent, err := cacheData.configClient.decrypt(cacheData.dataId, cacheData.content)
 	if err != nil {
@@ -505,9 +504,8 @@ func (client *ConfigClient) refreshContentAndCheck(cacheData cacheData, notify b
 	}
 	cacheData.md5 = util.Md5(cacheData.content)
 	if cacheData.md5 != cacheData.cacheDataListener.lastMd5 {
-		client.cacheMap.Set(util.GetConfigCacheKey(cacheData.dataId, cacheData.group, cacheData.tenant), cacheData)
-
-		cacheData.executeListener()
+		cacheDataPtr := &cacheData
+		cacheDataPtr.executeListener()
 	}
 }
 

example/config/main.go

@@ -111,18 +111,18 @@ func main() {
 
 	time.Sleep(2 * time.Second)
 
-	//cancel config change
-	err = client.CancelListenConfig(vo.ConfigParam{
+	time.Sleep(1 * time.Second)
+	_, err = client.DeleteConfig(vo.ConfigParam{
 		DataId: "test-data",
 		Group:  "test-group",
 	})
-
 	time.Sleep(1 * time.Second)
-	_, err = client.DeleteConfig(vo.ConfigParam{
+
+	//cancel config change
+	err = client.CancelListenConfig(vo.ConfigParam{
 		DataId: "test-data",
 		Group:  "test-group",
 	})
-	time.Sleep(1 * time.Second)
 
 	searchPage, _ := client.SearchConfig(vo.SearchConfigParam{
 		Search:   "blur",