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

copy ec shards to disks already having ec volumes

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/5615
This commit is contained in:
chrislu
2024-09-03 21:19:10 -07:00
parent 3ca4069d86
commit 8e4bffc66b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/server/volume_grpc_copy.go
View File

@@ -63,7 +63,9 @@ func (vs *VolumeServer) VolumeCopy(req *volume_server_pb.VolumeCopyRequest, stre
if req.DiskType != "" { if req.DiskType != "" {
diskType = req.DiskType diskType = req.DiskType
} }
location := vs.store.FindFreeLocation(types.ToDiskType(diskType)) location := vs.store.FindFreeLocation(func(location *storage.DiskLocation) bool {
return location.DiskType == types.ToDiskType(diskType)
})
if location == nil { if location == nil {
return fmt.Errorf("no space left for disk type %s", types.ToDiskType(diskType).ReadableString()) return fmt.Errorf("no space left for disk type %s", types.ToDiskType(diskType).ReadableString())
} }

5
weed/server/volume_grpc_erasure_coding.go
View File

@@ -143,7 +143,10 @@ func (vs *VolumeServer) VolumeEcShardsCopy(ctx context.Context, req *volume_serv
glog.V(0).Infof("VolumeEcShardsCopy: %v", req) glog.V(0).Infof("VolumeEcShardsCopy: %v", req)
location := vs.store.FindFreeLocation(types.HardDriveType) location := vs.store.FindFreeLocation(func(location *storage.DiskLocation) bool {
_, found := location.FindEcVolume(needle.VolumeId(req.VolumeId))
return found
})
if location == nil { if location == nil {
return nil, fmt.Errorf("no space left") return nil, fmt.Errorf("no space left")
} }

8
weed/storage/store.go
View File

@@ -138,10 +138,10 @@ func (s *Store) findVolume(vid needle.VolumeId) *Volume {
} }
return nil return nil
} }
func (s *Store) FindFreeLocation(diskType DiskType) (ret *DiskLocation) { func (s *Store) FindFreeLocation(filterFn func(location *DiskLocation) bool) (ret *DiskLocation) {
max := int32(0) max := int32(0)
for _, location := range s.Locations { for _, location := range s.Locations {
if diskType != location.DiskType { if filterFn != nil && !filterFn(location) {
continue continue
} }
if location.isDiskSpaceLow { if location.isDiskSpaceLow {
@@ -162,7 +162,9 @@ func (s *Store) addVolume(vid needle.VolumeId, collection string, needleMapKind
if s.findVolume(vid) != nil { if s.findVolume(vid) != nil {
return fmt.Errorf("Volume Id %d already exists!", vid) return fmt.Errorf("Volume Id %d already exists!", vid)
} }
if location := s.FindFreeLocation(diskType); location != nil { if location := s.FindFreeLocation(func(location *DiskLocation) bool {
return location.DiskType == diskType
}); location != nil {
glog.V(0).Infof("In dir %s adds volume:%v collection:%s replicaPlacement:%v ttl:%v", glog.V(0).Infof("In dir %s adds volume:%v collection:%s replicaPlacement:%v ttl:%v",
location.Directory, vid, collection, replicaPlacement, ttl) location.Directory, vid, collection, replicaPlacement, ttl)
if volume, err := NewVolume(location.Directory, location.IdxDirectory, collection, vid, needleMapKind, replicaPlacement, ttl, preallocate, memoryMapMaxSizeMb, ldbTimeout); err == nil { if volume, err := NewVolume(location.Directory, location.IdxDirectory, collection, vid, needleMapKind, replicaPlacement, ttl, preallocate, memoryMapMaxSizeMb, ldbTimeout); err == nil {