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

refactoring

Browse Source
This commit is contained in:
Chris Lu
2019-06-22 10:56:54 -07:00
parent 95ad56d99d
commit 6bc3dee5b3
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
weed/shell/command_ec_encode.go
View File

@@ -245,19 +245,15 @@ func collectVolumeIdsForEcEncode(ctx context.Context, commandEnv *CommandEnv, se
fmt.Printf("ec encode volumes quiet for: %d seconds\n", quietSeconds) fmt.Printf("ec encode volumes quiet for: %d seconds\n", quietSeconds)
vidMap := make(map[uint32]bool) vidMap := make(map[uint32]bool)
for _, dc := range resp.TopologyInfo.DataCenterInfos { eachDataNode(resp.TopologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) {
for _, r := range dc.RackInfos { for _, v := range dn.VolumeInfos {
for _, dn := range r.DataNodeInfos { if v.Collection == selectedCollection && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds {
for _, v := range dn.VolumeInfos { if float64(v.Size) > fullPercentage/100*float64(resp.VolumeSizeLimitMb)*1024*1024 {
if v.Collection == selectedCollection && v.ModifiedAtSecond+quietSeconds < nowUnixSeconds { vidMap[v.Id] = true
if float64(v.Size) > fullPercentage/100*float64(resp.VolumeSizeLimitMb)*1024*1024 {
vidMap[v.Id] = true
}
}
} }
} }
} }
} })
for vid, _ := range vidMap { for vid, _ := range vidMap {
vids = append(vids, needle.VolumeId(vid)) vids = append(vids, needle.VolumeId(vid))

20
weed/shell/command_volume_fix_replication.go
View File

@@ -63,20 +63,16 @@ func (c *commandVolumeFixReplication) Do(args []string, commandEnv *CommandEnv,
replicatedVolumeLocations := make(map[uint32][]location) replicatedVolumeLocations := make(map[uint32][]location)
replicatedVolumeInfo := make(map[uint32]*master_pb.VolumeInformationMessage) replicatedVolumeInfo := make(map[uint32]*master_pb.VolumeInformationMessage)
var allLocations []location var allLocations []location
for _, dc := range resp.TopologyInfo.DataCenterInfos { eachDataNode(resp.TopologyInfo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) {
for _, rack := range dc.RackInfos { loc := newLocation(dc.Id, rack.Id, dn)
for _, dn := range rack.DataNodeInfos { for _, v := range dn.VolumeInfos {
loc := newLocation(dc.Id, rack.Id, dn) if v.ReplicaPlacement > 0 {
for _, v := range dn.VolumeInfos { replicatedVolumeLocations[v.Id] = append(replicatedVolumeLocations[v.Id], loc)
if v.ReplicaPlacement > 0 { replicatedVolumeInfo[v.Id] = v
replicatedVolumeLocations[v.Id] = append(replicatedVolumeLocations[v.Id], loc)
replicatedVolumeInfo[v.Id] = v
}
}
allLocations = append(allLocations, loc)
} }
} }
} allLocations = append(allLocations, loc)
})
// find all under replicated volumes // find all under replicated volumes
underReplicatedVolumeLocations := make(map[uint32][]location) underReplicatedVolumeLocations := make(map[uint32][]location)