Update pools during concurrent UpsertBackend

Author: clintonk

core/concurrent_cache/backend.go

@@ -121,6 +121,14 @@ func UpsertBackend(id, name, newName string) Subquery {
 
 				backends.lock()
 
+				// Update circular references
+				b.StoragePools().Range(func(k, v interface{}) bool {
+					if pool, poolOK := v.(storage.Pool); poolOK {
+						pool.SetBackend(b)
+					}
+					return true
+				})
+
 				// This is the canonical method for upserting with a unique key.
 				// There are 4 cases: key and newKey are equal, key is empty, newKey is empty,
 				// and key and newKey are different. In all cases expect #3,

core/concurrent_cache/backend_test.go

@@ -1,13 +1,15 @@
 package concurrent_cache
 
 import (
+	"sync"
 	"testing"
 
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 
 	"github.com/netapp/trident/core/metrics"
+	mockstorage "github.com/netapp/trident/mocks/mock_storage"
 	"github.com/netapp/trident/storage"
 )
 
@@ -44,6 +46,7 @@ func TestUpsertBackend_Metrics(t *testing.T) {
 					"state":      string(storage.Online),
 					"uuid":       "test-backend-uuid",
 				})
+
 				backends.lock()
 				backends.data["test-backend-uuid"] = tt.initialBackend
 				backends.unlock()
@@ -56,13 +59,21 @@ func TestUpsertBackend_Metrics(t *testing.T) {
 			initialTridentBackendInfo := testutil.ToFloat64(metrics.TridentBackendInfo.WithLabelValues("test-driver", "existing-backend", "test-backend-uuid"))
 
 			// Create upsert backend
-			tt.upsertBackend = getMockBackendWithMap(mockCtrl, map[string]string{
+			mockUpsertBackend := getMockBackendWithMap(mockCtrl, map[string]string{
 				"name":       "updated-backend",
 				"driverName": "test-driver",
 				"state":      string(storage.Online),
 				"uuid":       "test-backend-uuid",
 			})
 
+			mockPool := mockstorage.NewMockPool(mockCtrl)
+			mockPool.EXPECT().SetBackend(mockUpsertBackend).Times(1)
+			mockPoolMap := sync.Map{}
+			mockPoolMap.Store("mock-pool", mockPool)
+
+			mockUpsertBackend.EXPECT().StoragePools().Return(&mockPoolMap).AnyTimes()
+			tt.upsertBackend = mockUpsertBackend
+
 			// Execute upsert operation
 			subquery := UpsertBackend("test-backend-uuid", "test-backend", "updated-backend")
 			result := &Result{}

core/concurrent_cache/concurrent_cache_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 
+	mockstorage "github.com/netapp/trident/mocks/mock_storage"
 	"github.com/netapp/trident/storage"
 	storageclass "github.com/netapp/trident/storage_class"
 	"github.com/netapp/trident/utils/models"
@@ -677,21 +678,30 @@ func setupTestData(t *testing.T, numIds int) {
 
 	for i := 0; i < numIds; i++ {
 		backendName := fmt.Sprintf("backend%d", i+1)
+		poolName := fmt.Sprintf("pool%d", i+1)
 		volumeName := fmt.Sprintf("volume%d", i+1)
 		snapshotName := fmt.Sprintf("snapshot%d", i+1)
 		nodeName := fmt.Sprintf("node%d", i+1)
 		storageClassName := fmt.Sprintf("sc%d", i+1)
 		subordinateVolumeName := fmt.Sprintf("subvol%d", i+1)
 
 		// Add some test data to avoid nil pointer dereferences
-		backends.lock()
-		backends.data[backendName] = getMockBackendWithMap(mockCtrl, map[string]string{
+		mockBackend := getMockBackendWithMap(mockCtrl, map[string]string{
 			"name":       backendName,
 			"driverName": "test-driver",
 			"uuid":       backendName,
 			"uniqueKey":  backendName,
 			"state":      "online",
 		})
+
+		mockPool := mockstorage.NewMockPool(mockCtrl)
+		mockPool.EXPECT().SetBackend(mockBackend).AnyTimes()
+		mockPoolMap := sync.Map{}
+		mockPoolMap.Store(poolName, mockPool)
+		mockBackend.EXPECT().StoragePools().Return(&mockPoolMap).AnyTimes()
+
+		backends.lock()
+		backends.data[backendName] = mockBackend
 		backends.key.data[backendName] = backendName
 		backends.unlock()
 

core/concurrent_core.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/netapp/trident/config"
 	db "github.com/netapp/trident/core/concurrent_cache"
+	"github.com/netapp/trident/core/metrics"
 	"github.com/netapp/trident/frontend"
 	controllerhelpers "github.com/netapp/trident/frontend/csi/controller_helpers"
 	. "github.com/netapp/trident/logging"
@@ -248,6 +249,9 @@ func (o *ConcurrentTridentOrchestrator) bootstrap(ctx context.Context) error {
 
 	o.RebuildStorageClassPoolMap(ctx)
 
+	metrics.TridentBuildInfo.WithLabelValues(config.BuildHash,
+		config.OrchestratorVersion.ShortString(), config.BuildType).Set(float64(1))
+
 	return nil
 }