Skip to content

Commit

Permalink
fix ovn-bridge-mappings deletion (#2564)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzujian
zhangzujian committed Mar 28, 2023
1 parent 21315e7 commit e996267
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 80 deletions.
58 changes: 14 additions & 44 deletions pkg/daemon/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,56 +135,19 @@ func ovsInitProviderNetwork(provider, nic string, exchangeLinkName, macLearningF
}

func ovsCleanProviderNetwork(provider string) error {
output, err := ovs.Exec(ovs.IfExists, "get", "open", ".", "external-ids:ovn-bridge-mappings")
mappings, err := getOvnMappings("ovn-bridge-mappings")
if err != nil {
return fmt.Errorf("failed to get ovn-bridge-mappings, %v: %q", err, output)
return err
}

var idx int
var m, brName string
mappingPrefix := provider + ":"
brMappings := strings.Split(output, ",")
for idx, m = range brMappings {
if strings.HasPrefix(m, mappingPrefix) {
brName = m[len(mappingPrefix):]
klog.V(3).Infof("found bridge name for provider %s: %s", provider, brName)
break
}
}

if idx != len(brMappings) {
brMappings = append(brMappings[:idx], brMappings[idx+1:]...)
if len(brMappings) == 0 {
output, err = ovs.Exec(ovs.IfExists, "remove", "open", ".", "external-ids", "ovn-bridge-mappings")
} else {
output, err = ovs.Exec("set", "open", ".", "external-ids:ovn-bridge-mappings="+strings.Join(brMappings, ","))
}
if err != nil {
return fmt.Errorf("failed to set ovn-bridge-mappings, %v: %q", err, output)
}
brName := mappings[provider]
if brName == "" {
return nil
}

if output, err = ovs.Exec(ovs.IfExists, "get", "open", ".", "external-ids:ovn-chassis-mac-mappings"); err != nil {
return fmt.Errorf("failed to get ovn-chassis-mac-mappings, %v: %q", err, output)
}
macMappings := strings.Split(output, ",")
for _, macMap := range macMappings {
if strings.HasPrefix(macMap, mappingPrefix) {
macMappings = util.RemoveString(macMappings, macMap)
break
}
}
if len(macMappings) == 0 {
output, err = ovs.Exec(ovs.IfExists, "remove", "open", ".", "external-ids", "ovn-chassis-mac-mappings")
} else {
output, err = ovs.Exec("set", "open", ".", "external-ids:ovn-chassis-mac-mappings="+strings.Join(macMappings, ","))
}
output, err := ovs.Exec("list-br")
if err != nil {
return fmt.Errorf("failed to set ovn-chassis-mac-mappings, %v: %q", err, output)
}

if output, err = ovs.Exec("list-br"); err != nil {
return fmt.Errorf("failed to list OVS bridge %v: %q", err, output)
return fmt.Errorf("failed to list OVS bridges: %v, %q", err, output)
}

if !util.ContainsString(strings.Split(output, "\n"), brName) {
Expand Down Expand Up @@ -223,5 +186,12 @@ func ovsCleanProviderNetwork(provider string) error {
}
}

if err := removeOvnMapping("ovn-chassis-mac-mappings", provider); err != nil {
return err
}
if err := removeOvnMapping("ovn-bridge-mappings", provider); err != nil {
return err
}

return nil
}
105 changes: 69 additions & 36 deletions pkg/daemon/ovs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,12 @@ func configureEmptyMirror(portName string, mtu int) error {
return configureMirrorLink(portName, mtu)
}

func updateOvnMapping(name, key, value string) error {
output, err := ovs.Exec(ovs.IfExists, "get", "open", ".", "external-ids:"+name)
if err != nil {
return fmt.Errorf("failed to get %s, %v: %q", name, err, output)
func decodeOvnMappings(s string) map[string]string {
if len(s) == 0 {
return map[string]string{}
}

if len(output) == 0 {
s := fmt.Sprintf("external-ids:%s=%s:%s", name, key, value)
if output, err = ovs.Exec("set", "open", ".", s); err != nil {
return fmt.Errorf("failed to set %s, %v: %q", name, err, output)
}
return nil
}

fields := strings.Split(output, ",")
fields := strings.Split(s, ",")
mappings := make(map[string]string, len(fields)+1)
for _, f := range fields {
idx := strings.IndexRune(f, ':')
Expand All @@ -95,17 +86,37 @@ func updateOvnMapping(name, key, value string) error {
}
mappings[f[:idx]] = f[idx+1:]
}
mappings[key] = value
return mappings
}

func encodeOvnMappings(mappings map[string]string) string {
if len(mappings) == 0 {
return ""
}

fields = make([]string, 0, len(mappings))
fields := make([]string, 0, len(mappings))
for k, v := range mappings {
fields = append(fields, fmt.Sprintf("%s:%s", k, v))
fields = append(fields, fmt.Sprintf("%s:%v", k, v))
}
return strings.Join(fields, ",")
}

if len(fields) == 0 {
func getOvnMappings(name string) (map[string]string, error) {
output, err := ovs.Exec(ovs.IfExists, "get", "open", ".", "external-ids:"+name)
if err != nil {
return nil, fmt.Errorf("failed to get %s, %v: %q", name, err, output)
}

return decodeOvnMappings(output), nil
}

func setOvnMappings(name string, mappings map[string]string) error {
var err error
var output string
if s := encodeOvnMappings(mappings); len(s) == 0 {
output, err = ovs.Exec(ovs.IfExists, "remove", "open", ".", "external-ids", name)
} else {
output, err = ovs.Exec("set", "open", ".", fmt.Sprintf("external-ids:%s=%s", name, strings.Join(fields, ",")))
output, err = ovs.Exec("set", "open", ".", fmt.Sprintf("external-ids:%s=%s", name, s))
}
if err != nil {
return fmt.Errorf("failed to set %s, %v: %q", name, err, output)
Expand All @@ -114,6 +125,42 @@ func updateOvnMapping(name, key, value string) error {
return nil
}

func addOvnMapping(name, key, value string, overwrite bool) error {
mappings, err := getOvnMappings(name)
if err != nil {
return err
}

if mappings[key] == value || (mappings[key] != "" && !overwrite) {
return nil
}

mappings[key] = value
if err = setOvnMappings(name, mappings); err != nil {
return err
}

return nil
}

func removeOvnMapping(name, key string) error {
mappings, err := getOvnMappings(name)
if err != nil {
return err
}

length := len(mappings)
delete(mappings, key)
if len(mappings) == length {
return nil
}
if err = setOvnMappings(name, mappings); err != nil {
return err
}

return nil
}

func configExternalBridge(provider, bridge, nic string, exchangeLinkName, macLearningFallback bool) error {
brExists, err := ovs.BridgeExists(bridge)
if err != nil {
Expand Down Expand Up @@ -152,7 +199,7 @@ func configExternalBridge(provider, bridge, nic string, exchangeLinkName, macLea
}
}

if err = updateOvnMapping("ovn-bridge-mappings", provider, bridge); err != nil {
if err = addOvnMapping("ovn-bridge-mappings", provider, bridge, true); err != nil {
klog.Error(err)
return err
}
Expand All @@ -161,23 +208,9 @@ func configExternalBridge(provider, bridge, nic string, exchangeLinkName, macLea
}

func initProviderChassisMac(provider string) error {
output, err := ovs.Exec(ovs.IfExists, "get", "open", ".", "external-ids:ovn-chassis-mac-mappings")
if err != nil {
return fmt.Errorf("failed to get ovn-bridge-mappings, %v", err)
}

for _, macMap := range strings.Split(output, ",") {
if len(macMap) == len(provider)+18 && strings.Contains(output, provider) {
return nil
}
}

macMappings := fmt.Sprintf("%s:%s", provider, util.GenerateMac())
if output != "" {
macMappings = fmt.Sprintf("%s,%s", output, macMappings)
}
if output, err = ovs.Exec("set", "open", ".", "external-ids:ovn-chassis-mac-mappings="+macMappings); err != nil {
return fmt.Errorf("failed to set ovn-chassis-mac-mappings, %v: %q", err, output)
if err := addOvnMapping("ovn-chassis-mac-mappings", provider, util.GenerateMac(), false); err != nil {
klog.Error(err)
return err
}
return nil
}

0 comments on commit e996267

Please sign in to comment.