opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10652 from rainzm/wire/merge

Browse Source 
fix(region): rigorously merge the network under wire
This commit is contained in:
Zexi Li
2021-04-07 18:07:41 +08:00
committed by GitHub
parent e581183565 692754b941
commit c1c2f376cc
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/tasks/networks_under_wire_merge_task.go
+27 -6
View File
@@ -91,16 +91,37 @@ func (self *NetworksUnderWireMergeTask) OnInit(ctx context.Context, obj db.IStan
wireNets = append(wireNets, nets[i].SNetwork)
}
}
startIp, endIp, err := nets[i].CheckInvalidToMerge(ctx, nets[i+1].SNetwork, wireNets)
if err != nil {
log.Debugf("unable to merge network %q to %q: %v", nets[i].GetId(), nets[i+1].GetId(), err)
continue
}
err = nets[i].MergeToNetworkAfterCheck(ctx, self.UserCred, nets[i+1].SNetwork, startIp, endIp)
ok, err := self.mergeNetwork(ctx, nets[i].SNetwork, nets[i+1].SNetwork, wireNets)
if err != nil {
self.taskFailed(ctx, w, fmt.Sprintf("unable to merge network %q to %q", nets[i].GetId(), nets[i+1].GetId()), err)
return
}
if ok {
continue
}
// Try to merge in the opposite direction
ok, err = self.mergeNetwork(ctx, nets[i+1].SNetwork, nets[i].SNetwork, wireNets)
if err != nil {
self.taskFailed(ctx, w, fmt.Sprintf("unable to merge network %q to %q", nets[i+1].GetId(), nets[i].GetId()), err)
return
}
if ok {
// Swap position
nets[i], nets[i+1] = nets[i+1], nets[i]
}
}
self.taskSuccess(ctx, w, "")
}
func (self *NetworksUnderWireMergeTask) mergeNetwork(ctx context.Context, source, target *models.SNetwork, wireNets []*models.SNetwork) (bool, error) {
startIp, endIp, err := source.CheckInvalidToMerge(ctx, target, wireNets)
if err != nil {
log.Debugf("unable to merge network %q to %q: %v", source.GetId(), target.GetId(), err)
return false, nil
}
err = source.MergeToNetworkAfterCheck(ctx, self.UserCred, target, startIp, endIp)
if err != nil {
return false, err
}
return true, nil
}