diff --git a/weed/topology/race_condition_stress_test.go b/weed/topology/race_condition_stress_test.go index 202e59909..a60f0a32a 100644 --- a/weed/topology/race_condition_stress_test.go +++ b/weed/topology/race_condition_stress_test.go @@ -85,8 +85,10 @@ func TestRaceConditionStress(t *testing.T) { // Simulate successful volume creation for _, server := range servers { disk := server.children[NodeId(types.HardDriveType.String())].(*Disk) - diskUsage := disk.diskUsages.getOrCreateDisk(types.HardDriveType) - atomic.AddInt64(&diskUsage.volumeCount, 1) + deltaDiskUsage := &DiskUsageCounts{ + volumeCount: 1, + } + disk.UpAdjustDiskUsageDelta(types.HardDriveType, deltaDiskUsage) atomic.AddInt64(&totalVolumesCreated, 1) } diff --git a/weed/topology/volume_growth_reservation_test.go b/weed/topology/volume_growth_reservation_test.go index a1fe1f5bb..6f7b0fbea 100644 --- a/weed/topology/volume_growth_reservation_test.go +++ b/weed/topology/volume_growth_reservation_test.go @@ -2,7 +2,6 @@ package topology import ( "sync" - "sync/atomic" "testing" "time" @@ -81,8 +80,11 @@ func TestVolumeGrowth_ReservationBasedAllocation(t *testing.T) { } // Simulate successful volume creation - diskUsage := dn.diskUsages.getOrCreateDisk(types.HardDriveType) - atomic.AddInt64(&diskUsage.volumeCount, 1) + disk := dn.children[NodeId(types.HardDriveType.String())].(*Disk) + deltaDiskUsage := &DiskUsageCounts{ + volumeCount: 1, + } + disk.UpAdjustDiskUsageDelta(types.HardDriveType, deltaDiskUsage) // Release reservation after successful creation reservation.releaseAllReservations() @@ -154,8 +156,11 @@ func TestVolumeGrowth_ConcurrentAllocationPreventsRaceCondition(t *testing.T) { if reservation != nil { reservation.releaseAllReservations() // Simulate volume creation by incrementing count - diskUsage := dn.diskUsages.getOrCreateDisk(types.HardDriveType) - atomic.AddInt64(&diskUsage.volumeCount, 1) + disk := dn.children[NodeId(types.HardDriveType.String())].(*Disk) + deltaDiskUsage := &DiskUsageCounts{ + volumeCount: 1, + } + disk.UpAdjustDiskUsageDelta(types.HardDriveType, deltaDiskUsage) } } mu.Unlock()