fix data race on makeCapacity & fakeController

pkg/capacity/capacity_test.go

@@ -132,6 +132,7 @@ csistoragecapacities_obsolete %d
 // TestCapacityController checks that the controller handles the initial state and
 // several different changes at runtime correctly.
 func TestCapacityController(t *testing.T) {
+	utilruntime.ReallyCrash = false // avoids os.Exit after "close of closed channel" in shared informer code
 	testcases := map[string]struct {
 		immediateBinding   bool
 		owner              *metav1.OwnerReference
@@ -1338,9 +1339,8 @@ func updateCSIStorageCapacityReactor() func(action ktesting.Action) (handled boo
 	}
 }
 
-func fakeController(ctx context.Context, client *fakeclientset.Clientset, owner *metav1.OwnerReference, storage CSICapacityClient, topologyInformer topology.Informer, immediateBinding bool) (*Controller, metrics.KubeRegistry) {
-	utilruntime.ReallyCrash = false // avoids os.Exit after "close of closed channel" in shared informer code
 
+func fakeController(ctx context.Context, client *fakeclientset.Clientset, owner *metav1.OwnerReference, storage CSICapacityClient, topologyInformer topology.Informer, immediateBinding bool) (*Controller, metrics.KubeRegistry) {
 	// We don't need resyncs, they just lead to confusing log output if they get triggered while already some
 	// new test is running.
 	resyncPeriod := time.Hour
@@ -1608,10 +1608,28 @@ func str2quantity(str string) *resource.Quantity {
 	return &quantity
 }
 
-var capacityCounter int
+type capacityCount struct {
+	sync.RWMutex
+	capacityCounter int
+}
+
+func (c *capacityCount) increment() {
+	c.Lock()
+	defer c.Unlock()
+
+	c.capacityCounter++
+}
+
+func (c *capacityCount) getCapacityCounter() int {
+	c.RLock()
+	defer c.RUnlock()
+	return c.capacityCounter
+}
+
+var capCounterVar = &capacityCount{capacityCounter: 0}
 
 func makeCapacity(in testCapacity) *storagev1.CSIStorageCapacity {
-	capacityCounter++
+	capCounterVar.increment()
 	var owners []metav1.OwnerReference
 	switch in.owner {
 	case nil:
@@ -1638,7 +1656,7 @@ func makeCapacity(in testCapacity) *storagev1.CSIStorageCapacity {
 		ObjectMeta: metav1.ObjectMeta{
 			UID:             in.uid,
 			ResourceVersion: in.resourceVersion,
-			Name:            fmt.Sprintf("csisc-%d", capacityCounter),
+			Name:            fmt.Sprintf("csisc-%d", capCounterVar.getCapacityCounter()),
 			Namespace:       ownerNamespace,
 			OwnerReferences: owners,
 			Labels:          labels,