update at 2024-08-09 17:18:56

Author: imroc

pkg/clb/listener.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sync"
 
 	clb "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb/v20180317"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
@@ -65,22 +64,6 @@ func GetListenerByPort(ctx context.Context, region, lbId string, port int64, pro
 
 const TkePodListenerName = "TKE-DEDICATED-POD"
 
-var (
-	lock      sync.Mutex
-	lbLockMap = make(map[string]*sync.Mutex)
-)
-
-func getLbLock(lbId string) *sync.Mutex {
-	lock.Lock()
-	defer lock.Unlock()
-	mux, ok := lbLockMap[lbId]
-	if !ok {
-		mux = &sync.Mutex{}
-		lbLockMap[lbId] = mux
-	}
-	return mux
-}
-
 func CreateListener(ctx context.Context, region string, req *clb.CreateListenerRequest) (id string, err error) {
 	req.ListenerNames = []*string{common.StringPtr(TkePodListenerName)}
 	client := GetClient(region)

pkg/clb/lock.go

@@ -0,0 +1,19 @@
+package clb
+
+import "sync"
+
+var (
+	lock      sync.Mutex
+	lbLockMap = make(map[string]*sync.Mutex)
+)
+
+func getLbLock(lbId string) *sync.Mutex {
+	lock.Lock()
+	defer lock.Unlock()
+	mux, ok := lbLockMap[lbId]
+	if !ok {
+		mux = &sync.Mutex{}
+		lbLockMap[lbId] = mux
+	}
+	return mux
+}

pkg/clb/target.go

@@ -103,6 +103,9 @@ func (t Target) String() string {
 }
 
 func DeregisterAllTargets(ctx context.Context, region, lbId, listenerId string) error {
+	mux := getLbLock(lbId)
+	mux.Lock()
+	defer mux.Unlock()
 	queryReq := clb.NewDescribeTargetsRequest()
 	queryReq.LoadBalancerId = &lbId
 	queryReq.ListenerIds = []*string{&listenerId}
@@ -129,6 +132,9 @@ func DeregisterAllTargets(ctx context.Context, region, lbId, listenerId string)
 }
 
 func DeregisterTargetsForListener(ctx context.Context, region, lbId, listenerId string, targets ...Target) error {
+	mux := getLbLock(lbId)
+	mux.Lock()
+	defer mux.Unlock()
 	clbTargets := getClbTargets(targets)
 	req := clb.NewDeregisterTargetsRequest()
 	req.LoadBalancerId = &lbId
@@ -153,6 +159,9 @@ func getClbTargets(targets []Target) (clbTargets []*clb.Target) {
 }
 
 func RegisterTargets(ctx context.Context, region, lbId, listenerId string, targets ...Target) error {
+	mux := getLbLock(lbId)
+	mux.Lock()
+	defer mux.Unlock()
 	clbTargets := getClbTargets(targets)
 	req := clb.NewRegisterTargetsRequest()
 	req.LoadBalancerId = &lbId