Merge pull request #14231 from dcbw/clean-up-multicast-flows

OpenShift Bot · web-flow · commit dd853cef4b4b · 2017-05-21T06:17:16.000-05:00
Merged by openshift-bot
diff --git a/pkg/sdn/plugin/vnids_node.go b/pkg/sdn/plugin/vnids_node.go
@@ -196,8 +196,9 @@ func (vmap *nodeVNIDMap) watchNetNamespaces() {
 				vmap.policy.UpdateNetNamespace(netns, oldNetID)
 			}
 		case cache.Deleted:
-			vmap.policy.DeleteNetNamespace(netns)
+			// Unset VNID first so further operations don't see the deleted VNID
 			vmap.unsetVNID(netns.NetName)
+			vmap.policy.DeleteNetNamespace(netns)
 		}
 		return nil
 	})

Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,9 @@ func (vmap *nodeVNIDMap) watchNetNamespaces() {`
`196`	`196`	`vmap.policy.UpdateNetNamespace(netns, oldNetID)`
`197`	`197`	`}`
`198`	`198`	`case cache.Deleted:`
`199`		`- vmap.policy.DeleteNetNamespace(netns)`
	`199`	`+ // Unset VNID first so further operations don't see the deleted VNID`
`200`	`200`	`vmap.unsetVNID(netns.NetName)`
	`201`	`+ vmap.policy.DeleteNetNamespace(netns)`
`201`	`202`	`}`
`202`	`203`	`return nil`
`203`	`204`	`})`