kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Serialize overlay filter plumbing

Browse source 
When plumbing overlay filter rules serialize this to make sure that
multiple sandbox join or leave is not causing erroneous behavior while
moving the RETURN rule in the predefined chains.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2016-09-22 17:50:19 -07:00
parent cfe5b1467e
commit d6e596b3a0
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libnetwork/drivers/overlay/filter.go
View file

@ -12,6 +12,13 @@ const globalChain = "DOCKER-OVERLAY"
var filterOnce sync.Once var filterOnce sync.Once
var filterChan = make(chan struct{}, 1)
func filterWait() func() {
filterChan <- struct{}{}
return func() { <-filterChan }
}
func chainExists(cname string) bool { func chainExists(cname string) bool {
if _, err := iptables.Raw("-L", cname); err != nil { if _, err := iptables.Raw("-L", cname); err != nil {
return false return false
@ -69,10 +76,14 @@ func setNetworkChain(cname string, remove bool) error {
} }
func addNetworkChain(cname string) error { func addNetworkChain(cname string) error {
defer filterWait()()
return setNetworkChain(cname, false) return setNetworkChain(cname, false)
} }
func removeNetworkChain(cname string) error { func removeNetworkChain(cname string) error {
defer filterWait()()
return setNetworkChain(cname, true) return setNetworkChain(cname, true)
} }
@ -119,9 +130,13 @@ func setFilters(cname, brName string, remove bool) error {
} }
func addFilters(cname, brName string) error { func addFilters(cname, brName string) error {
defer filterWait()()
return setFilters(cname, brName, false) return setFilters(cname, brName, false)
} }
func removeFilters(cname, brName string) error { func removeFilters(cname, brName string) error {
defer filterWait()()
return setFilters(cname, brName, true) return setFilters(cname, brName, true)
} }