From 9830c146d051bd7d0ff41a4607aac9ab63b0c5ea Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 25 Nov 2015 12:42:57 +0000 Subject: [PATCH] The bridge netdev is always named `weave` --- weave | 228 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 125 insertions(+), 103 deletions(-) diff --git a/weave b/weave index d3884cf3..1f96ffb0 100755 --- a/weave +++ b/weave @@ -294,9 +294,10 @@ PROCFS=${PROCFS:-/proc} DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0} CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave} BRIDGE=weave -FASTDP_BRIDGE=fdp-bridge -BRIDGE_IFNAME=${BRIDGE}-link -FASTDP_BRIDGE_IFNAME=${FASTDP_BRIDGE}-link +# This value is overridden when the datapath is used unbridged +DATAPATH=datapath +BRIDGE_IFNAME=link-${BRIDGE} +DATAPATH_IFNAME=${DATAPATH}-link CONTAINER_IFNAME=ethwe # ROUTER_HOSTNETNS_IFNAME is only used for fastdp with encryption ROUTER_HOSTNETNS_IFNAME=veth-weave @@ -401,25 +402,55 @@ random_mac() { # weave and docker specific helpers ###################################################################### -create_bridge() { +# Detect the current bridge/datapath state. When invoked, the values of +# $BRIDGE and $DATAPATH are expected to be distinct. $BRIDGE_TYPE and +# $DATAPATH are set correctly on success; failure indicates that the +# bridge/datapath devices have yet to be configured. If netdevs do exist +# but are in an inconsistent state the script aborts with an error. +detect_bridge_type() { BRIDGE_TYPE= - - if [ ! -d /sys/class/net/$BRIDGE ] ; then - if [ -n "$WEAVE_NO_FASTDP" ] ; then - BRIDGE_TYPE=bridge - elif docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --create-datapath --datapath=$BRIDGE ; then - # This is not meant to be exercised by users; to be - # replaced by autodetection as part of #1681. - if [ -n "$WEAVE_NO_BRIDGED_FASTDP" ]; then - BRIDGE_TYPE=fastdp - else - BRIDGE_TYPE=bridged_fastdp - fi - elif [ $? = 17 ] ; then - # Exit status of 17 means the kernel doesn't have ODP + if [ -d /sys/class/net/$DATAPATH ] ; then + # Unfortunately there's no simple way to positively check whether + # $DATAPATH is an ODP netdev so we have to make sure it isn't + # a bridge instead (and that $BRIDGE is). + if [ ! -d /sys/class/net/$DATAPATH/bridge -a -d /sys/class/net/$BRIDGE/bridge ] ; then + BRIDGE_TYPE=bridged_fastdp + else + echo "Inconsistent bridge state detected. Please do 'weave reset' and try again" >&2 + exit 1 + fi + elif [ -d /sys/class/net/$BRIDGE ] ; then + if [ -d /sys/class/net/$BRIDGE/bridge ] ; then BRIDGE_TYPE=bridge else - return 1 + BRIDGE_TYPE=fastdp + # The datapath is the bridge when there is no intermediary + DATAPATH="$BRIDGE" + fi + else + # No bridge/datapath devices configured + return 1 + fi +} + +create_bridge() { + if ! detect_bridge_type ; then + BRIDGE_TYPE=bridge + if [ -z "$WEAVE_NO_FASTDP" ] ; then + BRIDGE_TYPE=bridged_fastdp + if [ -n "$WEAVE_NO_BRIDGED_FASTDP" ] ; then + BRIDGE_TYPE=fastdp + # The datapath is the bridge when there is no intermediary + DATAPATH="$BRIDGE" + fi + if docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --create-datapath --datapath=$DATAPATH ; then + : # ODP datapath created successfully + elif [ $? = 17 ] ; then + # Exit status of 17 means the kernel doesn't have ODP + BRIDGE_TYPE=bridge + else + return 1 + fi fi init_bridge_$BRIDGE_TYPE @@ -443,14 +474,8 @@ create_bridge() { run_iptables -t nat -N WEAVE >/dev/null 2>&1 || true add_iptables_rule nat POSTROUTING -j WEAVE else - # Detect whether fast datapath is in use on - # $BRIDGE. Unfortunately there's no simple way to positively - # check whether $BRIDGE is a ODP netdev, so we have to check - # whether it is a bridge instead. - if [ -d /sys/class/net/$BRIDGE/bridge ] ; then - BRIDGE_TYPE=bridge - - if [ -n "$LAUNCHING_ROUTER" -a -z "$WEAVE_NO_FASTDP" ] ; then + if [ -n "$LAUNCHING_ROUTER" ] ; then + if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] ; then cat <&1 WEAVE_NO_FASTDP is not set, but there is already a bridge present of the wrong type for fast datapath. Please do 'weave reset' to remove @@ -458,14 +483,7 @@ the bridge first. EOF return 1 fi - else - if [ -d /sys/class/net/$FASTDP_BRIDGE ] ; then - BRIDGE_TYPE=bridged_fastdp - else - BRIDGE_TYPE=fastdp - fi - - if [ -n "$WEAVE_NO_FASTDP" ] ; then + if [ "$BRIDGE_TYPE" != bridge -a -n "$WEAVE_NO_FASTDP" ] ; then cat <&1 WEAVE_NO_FASTDP is set, but there is already a weave fast datapath bridge present. Please do 'weave reset' to remove the bridge first. @@ -501,44 +519,14 @@ init_bridge_fastdp() { MTU=${WEAVE_MTU:-1410} # create_bridge already created the datapath netdev - ip link set dev $BRIDGE mtu $MTU -} - -init_bridge_bridged_fastdp() { - # Initialise the datapath as normal. NB sets MTU for use below - init_bridge_fastdp - - # Create linking veth pair - ip link del $FASTDP_BRIDGE_IFNAME >/dev/null 2>&1 || true - ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true - ip link add name $FASTDP_BRIDGE_IFNAME mtu $MTU type veth peer name $BRIDGE_IFNAME mtu $MTU || return 1 - - # Create intermediary bridge netdev - ip link add name $FASTDP_BRIDGE type bridge - - # Set random MAC - ip link set dev $FASTDP_BRIDGE address $(random_mac) - - # Set MTU - ip link add name v${CONTAINER_IFNAME}du mtu $MTU type dummy - ip link set dev v${CONTAINER_IFNAME}du master $FASTDP_BRIDGE - ip link del dev v${CONTAINER_IFNAME}du - - # Link intermediary bridge and datapath - if ! ip link set $FASTDP_BRIDGE_IFNAME up || - ! ip link set $BRIDGE_IFNAME up || - ! add_iface_fastdp $BRIDGE_IFNAME || ! ip link set $FASTDP_BRIDGE_IFNAME master $FASTDP_BRIDGE ; then - ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true - ip link del $FASTDP_BRIDGE >/dev/null 2>&1 || true - docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --delete-datapath --datapath=$BRIDGE >/dev/null 2>&1 || true - return 1 - fi - - ip link set dev $FASTDP_BRIDGE up + ip link set dev $DATAPATH mtu $MTU } init_bridge_bridge() { - MTU=${WEAVE_MTU:-65535} + # Observe any MTU that is already set + if [ -z "$MTU" ] ; then + MTU=${WEAVE_MTU:-65535} + fi ip link add name $BRIDGE type bridge @@ -556,11 +544,37 @@ init_bridge_bridge() { ip link del dev v${CONTAINER_IFNAME}du } -ethtool_tx_off_fastdp() { - true +init_bridge_bridged_fastdp() { + # Initialise the datapath as normal. NB sets MTU for use below + init_bridge_fastdp + + # Create linking veth pair. We do this before initialising the bridge + # so that `ip link show` displays the datapath, linking veths and + # the bridge in natural order + ip link del $DATAPATH_IFNAME >/dev/null 2>&1 || true + ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true + ip link add name $BRIDGE_IFNAME mtu $MTU type veth peer name $DATAPATH_IFNAME mtu $MTU || return 1 + + # Initialise the bridge using fast datapath MTU + init_bridge_bridge + + # Link intermediary bridge and datapath + if ! ip link set $DATAPATH_IFNAME up || + ! ip link set $BRIDGE_IFNAME up || + ! add_iface_fastdp $DATAPATH_IFNAME || ! ip link set $BRIDGE_IFNAME master $BRIDGE ; then + # Failed to link bridge and datapath - clean up + ip link del $BRIDGE >/dev/null 2>&1 || true + ip link del $DATAPATH_IFNAME >/dev/null 2>&1 || true + ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true + docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --delete-datapath --datapath=$DATAPATH >/dev/null 2>&1 || true + return 1 + fi + + # Finally, bring the datapath up + ip link set dev $DATAPATH up } -ethtool_tx_off_bridged_fastdp() { +ethtool_tx_off_fastdp() { true } @@ -568,20 +582,27 @@ ethtool_tx_off_bridge() { ethtool -K $1 tx off >/dev/null } +ethtool_tx_off_bridged_fastdp() { + true +} + destroy_bridge() { - if [ -d /sys/class/net/$BRIDGE ] ; then - if [ -d /sys/class/net/$BRIDGE/bridge ] ; then - ip link del dev $BRIDGE - else - docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --delete-datapath --datapath=$BRIDGE + # It's important that detect_bridge_type has not been called so + # we have distinct values for $BRIDGE and $DATAPATH. Make best efforts + # to remove netdevs of any type with those names so `weave reset` can + # recover from inconsistent states. + for NETDEV in $BRIDGE $DATAPATH ; do + if [ -d /sys/class/net/$NETDEV ] ; then + if [ -d /sys/class/net/$NETDEV/bridge ] ; then + ip link del $NETDEV + else + docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --delete-datapath --datapath=$NETDEV + fi fi - fi + done - if [ -d /sys/class/net/$FASTDP_BRIDGE ] ; then - ip link del dev $FASTDP_BRIDGE - fi - - ip link del $FASTDP_BRIDGE_IFNAME >/dev/null 2>&1 || true + # Remove any lingering bridged fastdp veth + ip link del $DATAPATH_IFNAME >/dev/null 2>&1 || true ip link del $BRIDGE_IFNAME >/dev/null 2>&1 || true if [ "$DOCKER_BRIDGE" != "$BRIDGE" ] ; then @@ -687,17 +708,17 @@ connect_container_to_bridge() { } add_iface_fastdp() { - docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --datapath=$BRIDGE --add-datapath-iface=$1 -} - -add_iface_bridged_fastdp() { - ip link set $1 master $FASTDP_BRIDGE + docker run --rm --privileged --net=host $IMAGE $COVERAGE_ARGS --datapath=$DATAPATH --add-datapath-iface=$1 } add_iface_bridge() { ip link set $1 master $BRIDGE } +add_iface_bridged_fastdp() { + add_iface_bridge "$@" +} + ask_version() { if ! DOCKERIMAGE=$(docker inspect --format='{{.Image}}' $1 2>/dev/null) ; then if ! DOCKERIMAGE=$(docker inspect --format='{{.Id}}' $2 2>/dev/null) ; then @@ -709,7 +730,7 @@ ask_version() { router_opts_fastdp() { if [ -z "$WEAVE_PASSWORD" ] ; then - echo "--datapath $BRIDGE" + echo "--datapath $DATAPATH" else # When using encryption, we still do bridging on the ODP # datapath, because you can 'weave launch' without encryption @@ -727,18 +748,18 @@ router_opts_fastdp() { # Having a netdev in the host netns called "ethwe" might # surprise people, so it is called $ROUTER_HOSTNETNS_IFNAME # instead. - echo "--datapath $BRIDGE --iface $ROUTER_HOSTNETNS_IFNAME" + echo "--datapath $DATAPATH --iface $ROUTER_HOSTNETNS_IFNAME" fi } -router_opts_bridged_fastdp() { - router_opts_fastdp -} - router_opts_bridge() { echo "--iface $CONTAINER_IFNAME" } +router_opts_bridged_fastdp() { + router_opts_fastdp "$@" +} + ###################################################################### # functions invoked through with_container_netns ###################################################################### @@ -755,10 +776,6 @@ setup_router_iface_fastdp() { fi } -setup_router_iface_bridged_fastdp() { - setup_router_iface_fastdp -} - setup_router_iface_bridge() { if ! netnsenter ip link show eth0 >/dev/null ; then echo "Perhaps you are running the docker daemon with container networking disabled (-b=none)." >&2 @@ -773,6 +790,10 @@ setup_router_iface_bridge() { netnsenter ip link set $CONTAINER_IFNAME up } +setup_router_iface_bridged_fastdp() { + setup_router_iface_fastdp "$@" +} + attach() { if [ -h "$PROCFS/$CONTAINER_PID/ns/net" -a -h "/proc/self/ns/net" -a "$(readlink $PROCFS/$CONTAINER_PID/ns/net)" = "$(readlink /proc/self/ns/net)" ] ; then echo "Container is running in the host network namespace, and therefore cannot be" >&2 @@ -1536,7 +1557,7 @@ launch_router() { fi fi - if [ "$BRIDGE_TYPE" = fastdp -o "$BRIDGE_TYPE" = bridged_fastdp ] ; then + if [ "$BRIDGE_TYPE" != bridge ] ; then NETHOST_OPT="--net=host" HTTP_IP=127.0.0.1 # In case there is a lingering veth-weave netdev @@ -1593,9 +1614,10 @@ attach_router() { stop_router() { stop $CONTAINER_NAME "Weave" conntrack -D -p udp --dport $PORT >/dev/null 2>&1 || true - # remove the veth-weave netdev in a fastdp context - [ -d /sys/class/net/$BRIDGE -a ! -d /sys/class/net/$BRIDGE/bridge ] \ - && ip link del $ROUTER_HOSTNETNS_IFNAME >/dev/null 2>&1 || true + # Remove the veth-weave netdev in a fastdp context + if detect_bridge_type && [ "$BRIDGE_TYPE" != bridge ] ; then + ip link del $ROUTER_HOSTNETNS_IFNAME >/dev/null 2>&1 || true + fi } launch_proxy() {