mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/chrislusf/seaweedfs synced 2024-06-15 23:22:05 +02:00
Code Issues Projects Releases Wiki Activity

fix "volume.fix.replication" move many replications only to one volumeServer (#5522)

Browse source
This commit is contained in:
skycope 2024-04-23 21:33:50 +08:00 committed by GitHub
parent cc2885b4f2
commit 6e4b9181f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
weed/shell/command_volume_balance.go
View file

@ -402,14 +402,12 @@ func adjustAfterMove(v *master_pb.VolumeInformationMessage, volumeReplicas map[u
replica.location = &loc replica.location = &loc
for diskType, diskInfo := range fullNode.info.DiskInfos { for diskType, diskInfo := range fullNode.info.DiskInfos {
if diskType == v.DiskType { if diskType == v.DiskType {
diskInfo.VolumeCount-- addVolumeCount(diskInfo, -1)
diskInfo.FreeVolumeCount++
} }
} }
for diskType, diskInfo := range emptyNode.info.DiskInfos { for diskType, diskInfo := range emptyNode.info.DiskInfos {
if diskType == v.DiskType { if diskType == v.DiskType {
diskInfo.VolumeCount++ addVolumeCount(diskInfo, 1)
diskInfo.FreeVolumeCount--
} }
} }
return return

21
weed/shell/command_volume_fix_replication.go
View file

@ -4,16 +4,17 @@ import (
"context" "context"
"flag" "flag"
"fmt" "fmt"
"io"
"path/filepath"
"strconv"
"time"
"github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/needle"
"github.com/seaweedfs/seaweedfs/weed/storage/needle_map" "github.com/seaweedfs/seaweedfs/weed/storage/needle_map"
"github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/seaweedfs/seaweedfs/weed/storage/types"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"google.golang.org/grpc" "google.golang.org/grpc"
"io"
"path/filepath"
"strconv"
"time"
"github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/operation"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
@ -316,7 +317,7 @@ func (c *commandVolumeFixReplication) fixOneUnderReplicatedVolume(commandEnv *Co
if !takeAction { if !takeAction {
// adjust volume count // adjust volume count
dst.dataNode.DiskInfos[replica.info.DiskType].VolumeCount++ addVolumeCount(dst.dataNode.DiskInfos[replica.info.DiskType], 1)
break break
} }
@ -350,7 +351,7 @@ func (c *commandVolumeFixReplication) fixOneUnderReplicatedVolume(commandEnv *Co
} }
// adjust volume count // adjust volume count
dst.dataNode.DiskInfos[replica.info.DiskType].VolumeCount++ addVolumeCount(dst.dataNode.DiskInfos[replica.info.DiskType], 1)
break break
} }
} }
@ -361,6 +362,14 @@ func (c *commandVolumeFixReplication) fixOneUnderReplicatedVolume(commandEnv *Co
return nil return nil
} }
func addVolumeCount(info *master_pb.DiskInfo, count int) {
if info == nil {
return
}
info.VolumeCount += int64(count)
info.FreeVolumeCount -= int64(count)
}
func keepDataNodesSorted(dataNodes []location, diskType types.DiskType) { func keepDataNodesSorted(dataNodes []location, diskType types.DiskType) {
fn := capacityByFreeVolumeCount(diskType) fn := capacityByFreeVolumeCount(diskType)
slices.SortFunc(dataNodes, func(a, b location) int { slices.SortFunc(dataNodes, func(a, b location) int {

11
weed/shell/command_volume_tier_move.go
View file

@ -5,15 +5,16 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"io"
"path/filepath"
"sync"
"time"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/seaweedfs/seaweedfs/weed/storage/types"
"github.com/seaweedfs/seaweedfs/weed/wdclient" "github.com/seaweedfs/seaweedfs/weed/wdclient"
"io"
"path/filepath"
"sync"
"time"
"github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/operation"
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
@ -212,7 +213,7 @@ func (c *commandVolumeTierMove) doVolumeTierMove(commandEnv *CommandEnv, writer
hasFoundTarget = true hasFoundTarget = true
// adjust volume count // adjust volume count
dst.dataNode.DiskInfos[string(toDiskType)].VolumeCount++ addVolumeCount(dst.dataNode.DiskInfos[string(toDiskType)], 1)
destServerAddress := pb.NewServerAddressFromDataNode(dst.dataNode) destServerAddress := pb.NewServerAddressFromDataNode(dst.dataNode)
c.queues[destServerAddress] <- volumeTierMoveJob{sourceVolumeServer, vid} c.queues[destServerAddress] <- volumeTierMoveJob{sourceVolumeServer, vid}