lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-21 08:17:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

correcting free volume count, factor it during ec encoding to ensure enough disk space available

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/6163
This commit is contained in:
chrislu
2024-10-24 22:42:38 -07:00
parent 8d6189bcc5
commit 6e388e29c9
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
weed/shell/command_ec_encode.go
View File

@@ -315,16 +315,32 @@ func collectVolumeIdsForEcEncode(commandEnv *CommandEnv, selectedCollection stri
} }
if v.Collection == selectedCollection && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds { if v.Collection == selectedCollection && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds {
if float64(v.Size) > fullPercentage/100*float64(volumeSizeLimitMb)*1024*1024 { if float64(v.Size) > fullPercentage/100*float64(volumeSizeLimitMb)*1024*1024 {
if good, found := vidMap[v.Id]; found {
if good {
if diskInfo.FreeVolumeCount < 1 {
glog.V(0).Infof("skip %d.%d on %s, no free disk", v.Id, v.Collection, dn.Id)
vidMap[v.Id] = false
}
}
} else {
if diskInfo.FreeVolumeCount < 1 {
glog.V(0).Infof("skip %d.%d on %s, no free disk", v.Id, v.Collection, dn.Id)
vidMap[v.Id] = false
} else {
vidMap[v.Id] = true vidMap[v.Id] = true
} }
} }
} }
} }
}
}
}) })
for vid := range vidMap { for vid, good := range vidMap {
if good {
vids = append(vids, needle.VolumeId(vid)) vids = append(vids, needle.VolumeId(vid))
} }
}
return return
} }

4
weed/topology/disk.go
View File

@@ -66,7 +66,7 @@ func (d *DiskUsages) ToDiskInfo() map[string]*master_pb.DiskInfo {
m := &master_pb.DiskInfo{ m := &master_pb.DiskInfo{
VolumeCount: diskUsageCounts.volumeCount, VolumeCount: diskUsageCounts.volumeCount,
MaxVolumeCount: diskUsageCounts.maxVolumeCount, MaxVolumeCount: diskUsageCounts.maxVolumeCount,
FreeVolumeCount: diskUsageCounts.maxVolumeCount - diskUsageCounts.volumeCount, FreeVolumeCount: diskUsageCounts.maxVolumeCount - (diskUsageCounts.volumeCount - diskUsageCounts.remoteVolumeCount) - (diskUsageCounts.ecShardCount+1)/erasure_coding.DataShardsCount,
ActiveVolumeCount: diskUsageCounts.activeVolumeCount, ActiveVolumeCount: diskUsageCounts.activeVolumeCount,
RemoteVolumeCount: diskUsageCounts.remoteVolumeCount, RemoteVolumeCount: diskUsageCounts.remoteVolumeCount,
} }
@@ -250,7 +250,7 @@ func (d *Disk) ToDiskInfo() *master_pb.DiskInfo {
Type: string(d.Id()), Type: string(d.Id()),
VolumeCount: diskUsage.volumeCount, VolumeCount: diskUsage.volumeCount,
MaxVolumeCount: diskUsage.maxVolumeCount, MaxVolumeCount: diskUsage.maxVolumeCount,
FreeVolumeCount: diskUsage.maxVolumeCount - diskUsage.volumeCount, FreeVolumeCount: diskUsage.maxVolumeCount - (diskUsage.volumeCount - diskUsage.remoteVolumeCount) - (diskUsage.ecShardCount+1)/erasure_coding.DataShardsCount,
ActiveVolumeCount: diskUsage.activeVolumeCount, ActiveVolumeCount: diskUsage.activeVolumeCount,
RemoteVolumeCount: diskUsage.remoteVolumeCount, RemoteVolumeCount: diskUsage.remoteVolumeCount,
} }