Skip to content

Automated cherry pick of #372: fix: avoid panic #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ioito wants to merge 1 commit into from
Closed

Automated cherry pick of #372: fix: avoid panic #375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/agent/server/guest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/digitalocean/go-openvswitch/ovs"

"yunion.io/x/log"
"yunion.io/x/pkg/gotypes"
"yunion.io/x/sdnagent/pkg/agent/utils"

"yunion.io/x/onecloud/pkg/mcclient/auth"
Expand Down Expand Up @@ -187,6 +188,10 @@ func (g *Guest) clearClassicFlows(ctx context.Context) {
}
for bridge, _ := range bridges {
flowman := g.watcher.agent.GetFlowMan(bridge)
// 宿主机换过网桥名称，且宿主机上的虚拟机一直关机，未推送配置，会导致flowman为nil
if gotypes.IsNil(flowman) {
continue
}
flowman.updateFlows(ctx, g.Who(), []*ovs.Flow{})
}
g.clearPending()
Expand Down
Loading