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

fix: trigger vpcagent update when starting guest

Browse Source
This commit is contained in:
Qiu Jian
2022-12-04 02:56:50 +08:00
parent 380037f19c
commit eac5e84eff
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+14
View File
@@ -950,6 +950,20 @@ func (guest *SGuest) GetVpc() (*SVpc, error) {
return vpc, nil
}
func (guest *SGuest) IsOneCloudVpcNetwork() (bool, error) {
gns, err := guest.GetNetworks("")
if err != nil {
return false, errors.Wrap(err, "GetNetworks")
}
for _, gn := range gns {
n := gn.GetNetwork()
if n != nil && n.isOneCloudVpcNetwork() {
return true, nil
}
}
return false, nil
}
func (guest *SGuest) GetNetworks(netId string) ([]SGuestnetwork, error) {
guestnics := make([]SGuestnetwork, 0)
q := guest.GetNetworksQuery(netId).Asc("index")
pkg/compute/tasks/guest_start_task.go
+18 -4
View File
@@ -18,11 +18,15 @@ import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/compute/options"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modules/vpcagent"
"yunion.io/x/onecloud/pkg/util/logclient"
)
@@ -52,11 +56,21 @@ func (self *GuestStartTask) RequestStart(ctx context.Context, guest *models.SGue
}
}
func (self *GuestStartTask) OnStartComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
func (task *GuestStartTask) OnStartComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
guest := obj.(*models.SGuest)
db.OpsLog.LogEvent(guest, db.ACT_START, guest.GetShortDesc(ctx), self.UserCred)
logclient.AddActionLogWithStartable(self, guest, logclient.ACT_VM_START, guest.GetShortDesc(ctx), self.UserCred, true)
self.taskComplete(ctx, guest)
isVpc, err := guest.IsOneCloudVpcNetwork()
if err != nil {
log.Errorf("IsOneCloudVpcNetwork fail: %s", err)
} else if isVpc {
// force update VPC topo
err := vpcagent.VpcAgent.DoSync(auth.GetAdminSession(ctx, options.Options.Region))
if err != nil {
log.Errorf("vpcagent.VpcAgent.DoSync fail %s", err)
}
}
db.OpsLog.LogEvent(guest, db.ACT_START, guest.GetShortDesc(ctx), task.UserCred)
logclient.AddActionLogWithStartable(task, guest, logclient.ACT_VM_START, guest.GetShortDesc(ctx), task.UserCred, true)
task.taskComplete(ctx, guest)
}
func (self *GuestStartTask) OnStartCompleteFailed(ctx context.Context, obj db.IStandaloneModel, err jsonutils.JSONObject) {