Skip to content
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

Automated cherry pick of #6889: Support OF port state "down" when installing Pod #6893

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Automated cherry pick of #6889: Support OF port state "down" when installing Pod #6893

Show file tree
Hide file tree
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
20 changes: 17 additions & 3 deletions pkg/agent/cniserver/pod_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,12 +677,26 @@ func (pc *podConfigurator) recordPodEvent(ifConfig *interfacestore.InterfaceConf
}

func (pc *podConfigurator) processPortStatusMessage(status *openflow15.PortStatus) {
// Update Pod OpenFlow entries only after the OpenFlow port state is live.
if status.Desc.State != openflow15.PS_LIVE {
ofPort := status.Desc.PortNo
state := status.Desc.State
// Update Pod OpenFlow entries only after the OpenFlow port state is live or down.
// Accepting Port state "openflow15.PS_LINK_DOWN" is a workaround for Windows OVS issue https://github.com/openvswitch/ovs-issues/issues/351.
// In which OVS does not correctly implement function netdev_windows_update_flags, so OVS doesn't update ifp_flags
// after a new OpenFlow port is successfully installed. Since this OVS issue doesn't have side impact on datapath
// packets forwarding, antrea-agent will ignore the bad state to ensure the Pod's OpenFlow entries are installed as
// long as the port number is allocated.
if state != openflow15.PS_LIVE && state != openflow15.PS_LINK_DOWN {
klog.InfoS("Ignoring the OVS port status message with undesired state", "ofPort", ofPort, "state", state)
return
}

if ofPort == 0 {
klog.InfoS("Ignoring the OVS port status message with undesired port number", "ofPort", ofPort, "state", state)
return
}

ovsPort := string(bytes.Trim(status.Desc.Name, "\x00"))
ofPort := status.Desc.PortNo
klog.InfoS("Processing OVS port status message", "ovsPort", ovsPort, "ofPort", ofPort, "state", state)

ifConfig, found := pc.ifaceStore.GetInterfaceByName(ovsPort)
if !found {
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/cniserver/pod_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func TestProcessPortStatusMessage(t *testing.T) {
PortNo: 1,
Length: 72,
Name: []byte(fmt.Sprintf("%s\x00", podIfName)),
State: openflow15.PS_LINK_DOWN,
State: openflow15.PS_BLOCKED,
},
},
ovsPortName: podIfName,
Expand Down
Loading