mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-17 03:50:51 +02:00
Chris Lu
7e608c877a
* refactor(ec_balance): make the balance planner per-volume ratio-capable Thread a per-volume EC ratio through the balance planner: Plan resolves each volume's data/parity from a new Options.VolumeRatio (falling back to the collection Ratio, then the build default, when it reports 0), and keys the global phase's ratio maps by volume instead of collection. The shell and worker balance paths build the per-volume lookup from each shard's heartbeat via the new ecbalancer.VolumeShardRatio. In OSS this is behavior-preserving: VolumeShardRatio returns 0 because the per-volume data_shards/parity_shards heartbeat fields are an enterprise feature, so every volume falls back to the collection ratio -- the existing standard-scheme behavior. The refactor keeps the shared planner in sync with the enterprise fork, which overrides VolumeShardRatio to classify and spread a mixed-ratio collection by each volume's own data/parity split. * perf(ec_balance): hoist the collection ratio out of the per-volume loop The collection ratio is constant for every volume in a collection, so resolve it once per collection instead of per volume; a custom Ratio func may do map lookups or locking. Addresses a review comment.
25 lines
1.2 KiB
Go
25 lines
1.2 KiB
Go
package ecbalancer
|
|
|
|
import (
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
|
)
|
|
|
|
// shardDataShards returns the data-shard count of the volume an EC shard belongs
|
|
// to, used to size the shard's disk footprint. OSS uses the standard ratio for
|
|
// every volume; custom per-volume ratios are an enterprise feature, so the
|
|
// enterprise build overrides this to read the per-shard ratio.
|
|
func shardDataShards(eci *master_pb.VolumeEcShardInformationMessage) int {
|
|
return erasure_coding.DataShardsCount
|
|
}
|
|
|
|
// VolumeShardRatio returns the RAW per-volume (dataShards, parityShards) reported
|
|
// on an EC shard's heartbeat, with 0 meaning "not reported". Custom per-volume
|
|
// ratios are an enterprise feature and the OSS proto has no data_shards/parity_shards
|
|
// fields, so this returns 0, 0 and the balancer falls back to the collection ratio
|
|
// (the standard scheme). The enterprise build overrides this to read the per-shard
|
|
// ratio so a mixed-ratio collection is spread by each volume's own data/parity split.
|
|
func VolumeShardRatio(eci *master_pb.VolumeEcShardInformationMessage) (dataShards, parityShards int) {
|
|
return 0, 0
|
|
}
|