MB-39144 Use clusterInfoClient for updating cinfo cache in lifecycle mgr

BP of MB-38119 to 6.6.0 Change-Id: I861007be16231f650e3c28bbe787cb3459470ea9
couchbase · May 22, 2020 · c39f4bd · c39f4bd
1 parent 0499862
commit c39f4bd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/secondary/manager/lifecycle.go b/secondary/manager/lifecycle.go
@@ -39,6 +39,7 @@ import (
 type LifecycleMgr struct {
 	repo          *MetadataRepo
 	cinfo         *common.ClusterInfoCache
+	cinfoClient   *common.ClusterInfoClient
 	notifier      MetadataNotifier
 	clusterURL    string
 	incomings     chan *requestHolder
@@ -138,7 +139,8 @@ type updator struct {
 // Lifecycle Mgr - event processing
 //////////////////////////////////////////////////////////////
 
-func NewLifecycleMgr(notifier MetadataNotifier, clusterURL string) (*LifecycleMgr, error) {
+func NewLifecycleMgr(notifier MetadataNotifier, clusterURL string,
+	cinfoClient *common.ClusterInfoClient) (*LifecycleMgr, error) {
 
 	cinfo, err := common.FetchNewClusterInfoCache(clusterURL, common.DEFAULT_POOL)
 	if err != nil {
@@ -147,6 +149,7 @@ func NewLifecycleMgr(notifier MetadataNotifier, clusterURL string) (*LifecycleMg
 
 	mgr := &LifecycleMgr{repo: nil,
 		cinfo:        cinfo,
+		cinfoClient:  cinfoClient,
 		notifier:     notifier,
 		clusterURL:   clusterURL,
 		incomings:    make(chan *requestHolder, 100000),
@@ -3102,17 +3105,22 @@ func (m *LifecycleMgr) getServiceMap() (*client.ServiceMap, error) {
 func (m *LifecycleMgr) getBucketUUID(bucket string) (string, error) {
 	count := 0
 RETRY:
-	uuid, err := common.GetBucketUUID(m.clusterURL, bucket)
-	if err != nil && count < 5 {
+	cinfo := m.cinfoClient.GetClusterInfoCache()
+	cinfo.RLock()
+	uuid := cinfo.GetBucketUUID(bucket)
+	if uuid == common.BUCKET_UUID_NIL && count < 5 {
 		count++
+		cinfo.RUnlock()
 		time.Sleep(time.Duration(100) * time.Millisecond)
+		// Refresh cluster info cache
+		err := cinfo.FetchWithLock()
+		if err != nil {
+			return common.BUCKET_UUID_NIL, err
+		}
 		goto RETRY
 	}
 
-	if err != nil {
-		return common.BUCKET_UUID_NIL, err
-	}
-
+	defer cinfo.RUnlock()
 	return uuid, nil
 }
 

diff --git a/secondary/manager/manager.go b/secondary/manager/manager.go
@@ -143,9 +143,16 @@ func NewIndexManagerInternal(config common.Config, storageMode common.StorageMod
 		return nil, err
 	}
 
-	// Initialize LifecycleMgr.
 	mgr.clusterURL = config["clusterAddr"].String()
-	lifecycleMgr, err := NewLifecycleMgr(nil, mgr.clusterURL)
+	cic, err := common.NewClusterInfoClient(mgr.clusterURL, common.DEFAULT_POOL, config)
+	if err != nil {
+		mgr.Close()
+		return nil, err
+	}
+	mgr.cinfoClient = cic
+
+	// Initialize LifecycleMgr.
+	lifecycleMgr, err := NewLifecycleMgr(nil, mgr.clusterURL, mgr.cinfoClient)
 	if err != nil {
 		mgr.Close()
 		return nil, err
@@ -160,13 +167,6 @@ func NewIndexManagerInternal(config common.Config, storageMode common.StorageMod
 	os.Mkdir(mgr.basepath, 0755)
 	mgr.repoName = filepath.Join(mgr.basepath, gometaC.REPOSITORY_NAME)
 
-	cic, err := common.NewClusterInfoClient(mgr.clusterURL, common.DEFAULT_POOL, config)
-	if err != nil {
-		mgr.Close()
-		return nil, err
-	}
-	mgr.cinfoClient = cic
-
 	cinfo := cic.GetClusterInfoCache()
 	cinfo.RLock()
 	defer cinfo.RUnlock()