gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

factor in existing ec volume count when estimating max volume count

Browse Source 
related to https://github.com/seaweedfs/seaweedfs/issues/5191
This commit is contained in:
chrislu
2024-01-11 08:19:09 -08:00
parent a7fc723ae0
commit 050efe6c08
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/storage/disk_location_ec.go
View File

@@ -218,9 +218,13 @@ func (l *DiskLocation) unmountEcVolumeByCollection(collectionName string) map[ne
return deltaVols return deltaVols
} }
func (l *DiskLocation) EcVolumesLen() int { func (l *DiskLocation) EcShardCount() int {
l.ecVolumesLock.RLock() l.ecVolumesLock.RLock()
defer l.ecVolumesLock.RUnlock() defer l.ecVolumesLock.RUnlock()
return len(l.ecVolumes) shardCount := 0
for _, ecVolume := range l.ecVolumes {
shardCount += len(ecVolume.Shards)
}
return shardCount
} }

2
weed/storage/store.go
View File

@@ -149,7 +149,7 @@ func (s *Store) FindFreeLocation(diskType DiskType) (ret *DiskLocation) {
} }
currentFreeCount := location.MaxVolumeCount - int32(location.VolumesLen()) currentFreeCount := location.MaxVolumeCount - int32(location.VolumesLen())
currentFreeCount *= erasure_coding.DataShardsCount currentFreeCount *= erasure_coding.DataShardsCount
currentFreeCount -= int32(location.EcVolumesLen()) currentFreeCount -= int32(location.EcShardCount())
currentFreeCount /= erasure_coding.DataShardsCount currentFreeCount /= erasure_coding.DataShardsCount
if currentFreeCount > max { if currentFreeCount > max {
max = currentFreeCount max = currentFreeCount