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

Merge pull request #868 from mavenugo/fmeansf

Browse source 
Remove `isNodeAlive` check while force deleting endpoint
This commit is contained in:
Jana Radhakrishnan 2016-01-12 18:27:38 -08:00
commit be38401dd9
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/endpoint.go
View file

@ -615,10 +615,6 @@ func (n *network) validateForceDelete(locator string) error {
return fmt.Errorf("invalid endpoint locator identifier") return fmt.Errorf("invalid endpoint locator identifier")
} }
if n.getController().isNodeAlive(locator) {
return fmt.Errorf("the remote host %s hosting the container is alive", locator)
}
return nil return nil
} }

10
libnetwork/test/integration/dnet/overlay-consul.bats
View file

@ -39,18 +39,8 @@ load helpers
hrun runc $(dnet_container_name 1 consul) $(get_sbox_id 1 container_1) "ifconfig eth0" hrun runc $(dnet_container_name 1 consul) $(get_sbox_id 1 container_1) "ifconfig eth0"
container_1_ip=$(echo ${output} | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}') container_1_ip=$(echo ${output} | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}')
# forcefully unpublish the service from dnet2 when dnet1 is alive.
# operation must fail
set +e
dnet_cmd $(inst_id2port 2) service unpublish -f container_1.multihost
status="$?"
set -e
[ "${status}" -ne 0 ]
# ungracefully kill dnet-1-consul container # ungracefully kill dnet-1-consul container
docker rm -f dnet-1-consul docker rm -f dnet-1-consul
# sleep for 60 seconds to make sure the discovery catches up
sleep 60
# forcefully unpublish the service from dnet2 when dnet1 is dead. # forcefully unpublish the service from dnet2 when dnet1 is dead.
dnet_cmd $(inst_id2port 2) service unpublish -f container_1.multihost dnet_cmd $(inst_id2port 2) service unpublish -f container_1.multihost