[master] Do Automatic Volume Grow in background (#5781)
* Do Automatic Volume Grow in backgound * pass lastGrowCount to master * fix build * fix count to uint64
This commit is contained in:
committed by
GitHub
parent
ce61a66b65
commit
67edf1d014
@@ -42,6 +42,15 @@ func (t *Topology) ToInfo() (info TopologyInfo) {
|
||||
return
|
||||
}
|
||||
|
||||
func (t *Topology) ListVolumeLyauts() (volumeLayouts []*VolumeLayout) {
|
||||
for _, col := range t.collectionMap.Items() {
|
||||
for _, volumeLayout := range col.(*Collection).storageType2VolumeLayout.Items() {
|
||||
volumeLayouts = append(volumeLayouts, volumeLayout.(*VolumeLayout))
|
||||
}
|
||||
}
|
||||
return volumeLayouts
|
||||
}
|
||||
|
||||
func (t *Topology) ToVolumeMap() interface{} {
|
||||
m := make(map[string]interface{})
|
||||
m["Max"] = t.diskUsages.GetMaxVolumeCount()
|
||||
|
||||
@@ -27,14 +27,14 @@ This package is created to resolve these replica placement issues:
|
||||
|
||||
type VolumeGrowRequest struct {
|
||||
Option *VolumeGrowOption
|
||||
Count int
|
||||
Count uint32
|
||||
}
|
||||
|
||||
type volumeGrowthStrategy struct {
|
||||
Copy1Count int
|
||||
Copy2Count int
|
||||
Copy3Count int
|
||||
CopyOtherCount int
|
||||
Copy1Count uint32
|
||||
Copy2Count uint32
|
||||
Copy3Count uint32
|
||||
CopyOtherCount uint32
|
||||
Threshold float64
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ func NewDefaultVolumeGrowth() *VolumeGrowth {
|
||||
|
||||
// one replication type may need rp.GetCopyCount() actual volumes
|
||||
// given copyCount, how many logical volumes to create
|
||||
func (vg *VolumeGrowth) findVolumeCount(copyCount int) (count int) {
|
||||
func (vg *VolumeGrowth) findVolumeCount(copyCount int) (count uint32) {
|
||||
switch copyCount {
|
||||
case 1:
|
||||
count = VolumeGrowStrategy.Copy1Count
|
||||
@@ -89,7 +89,7 @@ func (vg *VolumeGrowth) findVolumeCount(copyCount int) (count int) {
|
||||
return
|
||||
}
|
||||
|
||||
func (vg *VolumeGrowth) AutomaticGrowByType(option *VolumeGrowOption, grpcDialOption grpc.DialOption, topo *Topology, targetCount int) (result []*master_pb.VolumeLocation, err error) {
|
||||
func (vg *VolumeGrowth) AutomaticGrowByType(option *VolumeGrowOption, grpcDialOption grpc.DialOption, topo *Topology, targetCount uint32) (result []*master_pb.VolumeLocation, err error) {
|
||||
if targetCount == 0 {
|
||||
targetCount = vg.findVolumeCount(option.ReplicaPlacement.GetCopyCount())
|
||||
}
|
||||
@@ -99,11 +99,11 @@ func (vg *VolumeGrowth) AutomaticGrowByType(option *VolumeGrowOption, grpcDialOp
|
||||
}
|
||||
return result, err
|
||||
}
|
||||
func (vg *VolumeGrowth) GrowByCountAndType(grpcDialOption grpc.DialOption, targetCount int, option *VolumeGrowOption, topo *Topology) (result []*master_pb.VolumeLocation, err error) {
|
||||
func (vg *VolumeGrowth) GrowByCountAndType(grpcDialOption grpc.DialOption, targetCount uint32, option *VolumeGrowOption, topo *Topology) (result []*master_pb.VolumeLocation, err error) {
|
||||
vg.accessLock.Lock()
|
||||
defer vg.accessLock.Unlock()
|
||||
|
||||
for i := 0; i < targetCount; i++ {
|
||||
for i := uint32(0); i < targetCount; i++ {
|
||||
if res, e := vg.findAndGrow(grpcDialOption, topo, option); e == nil {
|
||||
result = append(result, res...)
|
||||
} else {
|
||||
|
||||
@@ -107,7 +107,8 @@ func (v *volumesBinaryState) copyState(list *VolumeLocationList) copyState {
|
||||
// mapping from volume to its locations, inverted from server to volume
|
||||
type VolumeLayout struct {
|
||||
growRequest atomic.Bool
|
||||
rp *super_block.ReplicaPlacement
|
||||
lastGrowCount atomic.Uint32
|
||||
rp *super_block.ReplicaPlacement
|
||||
ttl *needle.TTL
|
||||
diskType types.DiskType
|
||||
vid2location map[needle.VolumeId]*VolumeLocationList
|
||||
@@ -354,6 +355,16 @@ func (vl *VolumeLayout) DoneGrowRequest() {
|
||||
vl.growRequest.Store(false)
|
||||
}
|
||||
|
||||
func (vl *VolumeLayout) SetLastGrowCount(count uint32) {
|
||||
if vl.lastGrowCount.Load() != count {
|
||||
vl.lastGrowCount.Store(count)
|
||||
}
|
||||
}
|
||||
|
||||
func (vl *VolumeLayout) GetLastGrowCount() uint32 {
|
||||
return vl.lastGrowCount.Load()
|
||||
}
|
||||
|
||||
func (vl *VolumeLayout) ShouldGrowVolumes(option *VolumeGrowOption) bool {
|
||||
total, active, crowded := vl.GetActiveVolumeCount(option)
|
||||
stats.MasterVolumeLayout.WithLabelValues(option.Collection, option.DataCenter, "total").Set(float64(total))
|
||||
@@ -539,6 +550,13 @@ func (vl *VolumeLayout) ToInfo() (info VolumeLayoutInfo) {
|
||||
return
|
||||
}
|
||||
|
||||
func (vl *VolumeLayout) ToGrowOption() (option *VolumeGrowOption) {
|
||||
option.ReplicaPlacement = vl.rp
|
||||
option.Ttl = vl.ttl
|
||||
option.DiskType = vl.diskType
|
||||
return
|
||||
}
|
||||
|
||||
func (vl *VolumeLayout) Stats() *VolumeLayoutStats {
|
||||
vl.accessLock.RLock()
|
||||
defer vl.accessLock.RUnlock()
|
||||
|
||||
Reference in New Issue
Block a user