Deallocate port before trying to delete iptables chain

Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
This commit is contained in:
Alexandr Morozov
2014-09-10 00:40:46 +04:00
parent f1095b801e
commit 2e7cf6b0ce
2 changed files with 31 additions and 6 deletions
+2 -6
View File
@@ -4,11 +4,11 @@ import (
"errors"
"fmt"
"net"
"strings"
"sync"
"github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/docker/docker/pkg/iptables"
"github.com/docker/docker/pkg/log"
)
type mapping struct {
@@ -127,10 +127,7 @@ func Unmap(host net.Addr) error {
containerIP, containerPort := getIPAndPort(data.container)
hostIP, hostPort := getIPAndPort(data.host)
if err := forward(iptables.Delete, data.proto, hostIP, hostPort, containerIP.String(), containerPort); err != nil {
// skip "no chain" errors because we can safely release port in this case
if !strings.Contains(err.Error(), "No chain/target/match by that name") {
return err
}
log.Errorf("Error on iptables delete: %s", err)
}
switch a := host.(type) {
@@ -139,7 +136,6 @@ func Unmap(host net.Addr) error {
case *net.UDPAddr:
return portallocator.ReleasePort(a.IP, "udp", a.Port)
}
return nil
}