mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-15 19:10:48 +02:00
* fix(ec): carry source disk type on VolumeEcShardsMount (#9423) When EC shards land on a target whose disk type differs from the source volume's, master heartbeats wrongly reported under the target disk's type. Add source_disk_type to VolumeEcShardsMountRequest; the target server applies it to the in-memory EcVolume via SetDiskType so the mount notification and steady-state heartbeat both carry the source's disk type. Empty value falls back to the location's disk type (used by disk-scan reload paths). The override is not persisted with the volume — disk type stays an environmental property and .vif remains portable. * fix(ec): plumb source disk type through plugin worker (#9423) Add source_disk_type to ErasureCodingTaskParams (field 8; 7 reserved), populate it from the metric the detector already collects, thread it through ec_task into the MountEcShards helper, and forward it on the VolumeEcShardsMount RPC. * fix(ec): mirror source disk type plumbing in rust volume server (#9423) The volume_ec_shards_mount handler now forwards source_disk_type into mount_ec_shard → DiskLocation::mount_ec_shards. When non-empty it overrides ec_vol.disk_type (and each mounted shard's disk_type) via the new set_disk_type method; empty value keeps the location's disk type, so disk-scan reload and reconcile paths are unchanged. Also picks up two pre-existing proto drifts that 'make gen' synced from weed/pb (LockRingUpdate in master.proto, listing_cache_ttl_seconds in remote.proto). * feat(ec): bias placement toward preferred disk type (#9423) Add DiskCandidate.DiskType and PlacementRequest.PreferredDiskType. When PreferredDiskType is non-empty, SelectDestinations partitions suitable disks into matching/fallback tiers and runs the rack/server/ disk-diversity passes on the matching tier first; the fallback tier is only consulted if the matching pool can't satisfy ShardsNeeded. PlacementResult.SpilledToOtherDiskType lets callers warn on spillover. Empty PreferredDiskType keeps the existing single-pool behavior. * fix(ec): plumb source disk type into placement planner (#9423) diskInfosToCandidates now copies DiskInfo.DiskType into the placement candidate, and ecPlacementPlanner.selectDestinations forwards metric.DiskType as PreferredDiskType so EC shards land on disks matching the source volume's disk type when possible. A glog warning fires when placement had to spill to other disk types. * test(ec): integration coverage for source-disk-type plumbing (#9423) store_ec_disk_type_test exercises Store.MountEcShards end-to-end: a shard physically lives on an HDD location, MountEcShards is called with sourceDiskType="ssd", and the test asserts that the in-memory EcVolume, the mounted shard, the NewEcShardsChan notification, and the steady-state heartbeat all report under the source's disk type. A companion test pins the empty-source path so disk-scan reload keeps the location's disk type. detection_disk_type_test exercises the worker plumbing: with a cluster of nodes carrying both HDD and SSD disks, planECDestinations must place every shard on SSD when metric.DiskType="ssd"; with only one SSD node and 13 HDD nodes it must still satisfy a 10+4 layout via spillover (and log a warning). * revert(ec): drop unrelated proto drift in seaweed-volume/proto (#9423) make gen pulled two pre-existing OSS changes into the rust proto tree (LockRingUpdate / by_plugin in master.proto, listing_cache_ttl_seconds in remote.proto). Reviewers flagged it as scope creep — none of the rust EC fix references those fields. Restore both files to origin/master so this branch only touches EC-related symbols. * fix(ec placement): treat empty disk type as hdd and skip used racks on spill (#9423) partitionByDiskType used raw string comparison, so a PreferredDiskType of "hdd" never matched candidates whose DiskType is "" (the HardDriveType sentinel that weed/storage/types uses). EC encoding of an HDD source would spill onto any HDD reporting "" even when the cluster has plenty of matching capacity. Normalize both sides through normalizeDiskType, which lowercases and folds "" → "hdd", mirroring types.ToDiskType without taking a dependency on it. selectFromTier's rack-diversity pass also kept revisiting racks the preferred tier had already used when running on the fallback tier, which negated PreferDifferentRacks on spillover. Skip racks already in usedRacks so fallback placements still spread onto new racks. * fix(ec): empty-source remount must not clobber existing disk type (#9423) mount_ec_shards_with_idx_dir runs more than once per vid (RPC mount, disk-scan reload, orphan-shard reconcile). After an RPC sets the source-derived disk type, any later call passing source_disk_type="" was resetting ec_vol.disk_type back to the location's value, which reintroduces the heartbeat drift this PR is meant to fix. Only default to the location's disk type when the EC volume is fresh (no shards mounted yet); otherwise leave the recorded type alone so empty-source reloads preserve whatever the original mount RPC set.
388 lines
11 KiB
Go
388 lines
11 KiB
Go
package erasure_coding
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/operation"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/worker_pb"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func ensureLogger(logger logger) logger {
|
|
if logger == nil {
|
|
return &glogFallbackLogger{}
|
|
}
|
|
return logger
|
|
}
|
|
|
|
type logger interface {
|
|
Info(string, ...interface{})
|
|
Warning(string, ...interface{})
|
|
Error(string, ...interface{})
|
|
}
|
|
|
|
type withFieldLogger interface {
|
|
WithFields(map[string]interface{}) logger
|
|
}
|
|
|
|
func withFields(log logger, fields map[string]interface{}) logger {
|
|
if fields == nil {
|
|
return log
|
|
}
|
|
if wf, ok := log.(withFieldLogger); ok {
|
|
return wf.WithFields(fields)
|
|
}
|
|
|
|
val := reflect.ValueOf(log)
|
|
method := val.MethodByName("WithFields")
|
|
if !method.IsValid() {
|
|
return log
|
|
}
|
|
methodType := method.Type()
|
|
if methodType.NumIn() != 1 || methodType.NumOut() != 1 {
|
|
return log
|
|
}
|
|
argType := methodType.In(0)
|
|
mapType := reflect.TypeOf(map[string]interface{}{})
|
|
var arg reflect.Value
|
|
if mapType.AssignableTo(argType) {
|
|
arg = reflect.ValueOf(fields)
|
|
} else if mapType.ConvertibleTo(argType) {
|
|
arg = reflect.ValueOf(fields).Convert(argType)
|
|
} else {
|
|
return log
|
|
}
|
|
result := method.Call([]reflect.Value{arg})[0]
|
|
if result.IsValid() && result.CanInterface() {
|
|
if enhanced, ok := result.Interface().(logger); ok {
|
|
return enhanced
|
|
}
|
|
}
|
|
return log
|
|
}
|
|
|
|
type glogFallbackLogger struct{}
|
|
|
|
func (g *glogFallbackLogger) Info(msg string, args ...interface{}) {
|
|
if len(args) > 0 {
|
|
glog.Infof(msg, args...)
|
|
return
|
|
}
|
|
glog.Info(msg)
|
|
}
|
|
|
|
func (g *glogFallbackLogger) Warning(msg string, args ...interface{}) {
|
|
if len(args) > 0 {
|
|
glog.Warningf(msg, args...)
|
|
return
|
|
}
|
|
glog.Warning(msg)
|
|
}
|
|
|
|
func (g *glogFallbackLogger) Error(msg string, args ...interface{}) {
|
|
if len(args) > 0 {
|
|
glog.Errorf(msg, args...)
|
|
return
|
|
}
|
|
glog.Error(msg)
|
|
}
|
|
|
|
// DistributeEcShards distributes locally generated EC shards to destination servers.
|
|
// Returns the shard assignment map used for mounting.
|
|
func DistributeEcShards(volumeID uint32, collection string, targets []*worker_pb.TaskTarget, shardFiles map[string]string, dialOption grpc.DialOption, logger logger) (map[string][]string, error) {
|
|
if len(targets) == 0 {
|
|
return nil, fmt.Errorf("no targets specified for EC shard distribution")
|
|
}
|
|
|
|
if len(shardFiles) == 0 {
|
|
return nil, fmt.Errorf("no shard files available for distribution")
|
|
}
|
|
|
|
log := ensureLogger(logger)
|
|
|
|
shardAssignment := make(map[string][]string)
|
|
// node → shardType → planner-assigned diskID. Metadata files (ecx/ecj/vif)
|
|
// inherit the first data shard's disk so they land next to the shards.
|
|
shardDisks := make(map[string]map[string]uint32)
|
|
|
|
for _, target := range targets {
|
|
if len(target.ShardIds) == 0 {
|
|
continue
|
|
}
|
|
|
|
var assignedShards []string
|
|
for _, shardId := range target.ShardIds {
|
|
shardType := fmt.Sprintf("ec%02d", shardId)
|
|
assignedShards = append(assignedShards, shardType)
|
|
}
|
|
|
|
if len(assignedShards) > 0 {
|
|
if _, hasEcx := shardFiles["ecx"]; hasEcx {
|
|
assignedShards = append(assignedShards, "ecx")
|
|
}
|
|
if _, hasEcj := shardFiles["ecj"]; hasEcj {
|
|
assignedShards = append(assignedShards, "ecj")
|
|
}
|
|
if _, hasVif := shardFiles["vif"]; hasVif {
|
|
assignedShards = append(assignedShards, "vif")
|
|
}
|
|
}
|
|
|
|
if shardDisks[target.Node] == nil {
|
|
shardDisks[target.Node] = make(map[string]uint32)
|
|
}
|
|
for _, shardType := range assignedShards {
|
|
if _, already := shardDisks[target.Node][shardType]; !already {
|
|
shardDisks[target.Node][shardType] = target.DiskId
|
|
}
|
|
}
|
|
|
|
existing := shardAssignment[target.Node]
|
|
if len(existing) == 0 {
|
|
shardAssignment[target.Node] = assignedShards
|
|
continue
|
|
}
|
|
|
|
seen := make(map[string]struct{}, len(existing))
|
|
for _, shard := range existing {
|
|
seen[shard] = struct{}{}
|
|
}
|
|
for _, shard := range assignedShards {
|
|
if _, ok := seen[shard]; ok {
|
|
continue
|
|
}
|
|
seen[shard] = struct{}{}
|
|
existing = append(existing, shard)
|
|
}
|
|
shardAssignment[target.Node] = existing
|
|
}
|
|
|
|
if len(shardAssignment) == 0 {
|
|
return nil, fmt.Errorf("no shard assignments found from planning phase")
|
|
}
|
|
|
|
for destNode, assignedShards := range shardAssignment {
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"assigned_shards": len(assignedShards),
|
|
"shard_types": assignedShards,
|
|
}).Info("Starting shard distribution to destination server")
|
|
|
|
var transferredBytes int64
|
|
for _, shardType := range assignedShards {
|
|
filePath, exists := shardFiles[shardType]
|
|
if !exists {
|
|
return nil, fmt.Errorf("shard file %s not found for destination %s", shardType, destNode)
|
|
}
|
|
|
|
if info, err := os.Stat(filePath); err == nil {
|
|
transferredBytes += info.Size()
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shard_type": shardType,
|
|
"file_path": filePath,
|
|
"size_bytes": info.Size(),
|
|
"size_kb": float64(info.Size()) / 1024,
|
|
}).Info("Starting shard file transfer")
|
|
}
|
|
|
|
diskID := uint32(0)
|
|
if byShard, ok := shardDisks[destNode]; ok {
|
|
diskID = byShard[shardType]
|
|
}
|
|
if err := sendShardFileToDestination(volumeID, collection, dialOption, destNode, diskID, filePath, shardType); err != nil {
|
|
return nil, fmt.Errorf("failed to send %s to %s: %w", shardType, destNode, err)
|
|
}
|
|
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shard_type": shardType,
|
|
}).Info("Shard file transfer completed")
|
|
}
|
|
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shards_transferred": len(assignedShards),
|
|
"total_bytes": transferredBytes,
|
|
"total_mb": float64(transferredBytes) / (1024 * 1024),
|
|
}).Info("All shards distributed to destination server")
|
|
}
|
|
|
|
glog.V(1).Infof("Successfully distributed EC shards to %d destinations", len(shardAssignment))
|
|
return shardAssignment, nil
|
|
}
|
|
|
|
// MountEcShards mounts EC shards on destination servers using an assignment map.
|
|
// sourceDiskType is forwarded to VolumeEcShardsMount so the resulting EC volume
|
|
// reports under the source's disk type rather than the destination's (#9423).
|
|
func MountEcShards(volumeID uint32, collection string, shardAssignment map[string][]string, sourceDiskType string, dialOption grpc.DialOption, logger logger) error {
|
|
if shardAssignment == nil {
|
|
return fmt.Errorf("shard assignment not available for mounting")
|
|
}
|
|
|
|
log := ensureLogger(logger)
|
|
|
|
var mountErrors []error
|
|
for destNode, assignedShards := range shardAssignment {
|
|
var shardIds []uint32
|
|
var metadataFiles []string
|
|
|
|
for _, shardType := range assignedShards {
|
|
if strings.HasPrefix(shardType, "ec") && len(shardType) == 4 {
|
|
var shardId uint32
|
|
if _, err := fmt.Sscanf(shardType[2:], "%d", &shardId); err == nil {
|
|
shardIds = append(shardIds, shardId)
|
|
}
|
|
} else {
|
|
metadataFiles = append(metadataFiles, shardType)
|
|
}
|
|
}
|
|
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shard_ids": shardIds,
|
|
"shard_count": len(shardIds),
|
|
"metadata_files": metadataFiles,
|
|
}).Info("Starting EC shard mount operation")
|
|
|
|
if len(shardIds) == 0 {
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"metadata_files": metadataFiles,
|
|
}).Info("No EC shards to mount (only metadata files)")
|
|
continue
|
|
}
|
|
|
|
err := operation.WithVolumeServerClient(false, pb.ServerAddress(destNode), dialOption,
|
|
func(client volume_server_pb.VolumeServerClient) error {
|
|
_, mountErr := client.VolumeEcShardsMount(context.Background(), &volume_server_pb.VolumeEcShardsMountRequest{
|
|
VolumeId: volumeID,
|
|
Collection: collection,
|
|
ShardIds: shardIds,
|
|
SourceDiskType: sourceDiskType,
|
|
})
|
|
return mountErr
|
|
})
|
|
|
|
if err != nil {
|
|
mountErrors = append(mountErrors, fmt.Errorf("mount %s shards %v: %w", destNode, shardIds, err))
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shard_ids": shardIds,
|
|
"error": err.Error(),
|
|
}).Error("Failed to mount EC shards")
|
|
} else {
|
|
withFields(log, map[string]interface{}{
|
|
"destination": destNode,
|
|
"shard_ids": shardIds,
|
|
"volume_id": volumeID,
|
|
"collection": collection,
|
|
}).Info("Successfully mounted EC shards")
|
|
}
|
|
}
|
|
|
|
if len(mountErrors) > 0 {
|
|
return errors.Join(mountErrors...)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// diskID=0 leaves disk placement to the server's auto-select.
|
|
func sendShardFileToDestination(volumeID uint32, collection string, dialOption grpc.DialOption, destServer string, diskID uint32, filePath, shardType string) error {
|
|
return operation.WithVolumeServerClient(false, pb.ServerAddress(destServer), dialOption,
|
|
func(client volume_server_pb.VolumeServerClient) error {
|
|
file, err := os.Open(filePath)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to open shard file %s: %v", filePath, err)
|
|
}
|
|
defer file.Close()
|
|
|
|
fileInfo, err := file.Stat()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get file info for %s: %v", filePath, err)
|
|
}
|
|
|
|
var ext string
|
|
var shardId uint32
|
|
if shardType == "ecx" {
|
|
ext = ".ecx"
|
|
shardId = 0
|
|
} else if shardType == "ecj" {
|
|
ext = ".ecj"
|
|
shardId = 0
|
|
} else if shardType == "vif" {
|
|
ext = ".vif"
|
|
shardId = 0
|
|
} else if strings.HasPrefix(shardType, "ec") && len(shardType) == 4 {
|
|
ext = "." + shardType
|
|
fmt.Sscanf(shardType[2:], "%d", &shardId)
|
|
} else {
|
|
return fmt.Errorf("unknown shard type: %s", shardType)
|
|
}
|
|
|
|
stream, err := client.ReceiveFile(context.Background())
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create receive stream: %v", err)
|
|
}
|
|
|
|
err = stream.Send(&volume_server_pb.ReceiveFileRequest{
|
|
Data: &volume_server_pb.ReceiveFileRequest_Info{
|
|
Info: &volume_server_pb.ReceiveFileInfo{
|
|
VolumeId: volumeID,
|
|
Ext: ext,
|
|
Collection: collection,
|
|
IsEcVolume: true,
|
|
ShardId: shardId,
|
|
FileSize: uint64(fileInfo.Size()),
|
|
DiskId: diskID,
|
|
},
|
|
},
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send file info: %v", err)
|
|
}
|
|
|
|
buffer := make([]byte, 64*1024)
|
|
for {
|
|
n, readErr := file.Read(buffer)
|
|
if n > 0 {
|
|
err = stream.Send(&volume_server_pb.ReceiveFileRequest{
|
|
Data: &volume_server_pb.ReceiveFileRequest_FileContent{
|
|
FileContent: buffer[:n],
|
|
},
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send file content: %v", err)
|
|
}
|
|
}
|
|
if readErr == io.EOF {
|
|
break
|
|
}
|
|
if readErr != nil {
|
|
return fmt.Errorf("failed to read file: %v", readErr)
|
|
}
|
|
}
|
|
|
|
resp, err := stream.CloseAndRecv()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to close stream: %v", err)
|
|
}
|
|
|
|
if resp.Error != "" {
|
|
return fmt.Errorf("server error: %s", resp.Error)
|
|
}
|
|
|
|
glog.V(2).Infof("Successfully sent %s (%d bytes) to %s", shardType, resp.BytesWritten, destServer)
|
|
return nil
|
|
})
|
|
}
|