mirror of
https://github.com/clearlinux/docker.git
synced 2026-10-03 15:28:35 +00:00
Gracefully handle network bridge without IP association at startup
Addresses #8444 Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
This commit is contained in:
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
@@ -92,3 +93,38 @@ func TestDaemonStartIptablesFalse(t *testing.T) {
|
||||
|
||||
logDone("daemon - started daemon with iptables=false")
|
||||
}
|
||||
|
||||
// Issue #8444: If docker0 bridge is modified (intentionally or unintentionally) and
|
||||
// no longer has an IP associated, we should gracefully handle that case and associate
|
||||
// an IP with it rather than fail daemon start
|
||||
func TestDaemonStartBridgeWithoutIPAssociation(t *testing.T) {
|
||||
d := NewDaemon(t)
|
||||
// rather than depending on brctl commands to verify docker0 is created and up
|
||||
// let's start the daemon and stop it, and then make a modification to run the
|
||||
// actual test
|
||||
if err := d.Start(); err != nil {
|
||||
t.Fatalf("Could not start daemon: %v", err)
|
||||
}
|
||||
if err := d.Stop(); err != nil {
|
||||
t.Fatalf("Could not stop daemon: %v", err)
|
||||
}
|
||||
|
||||
// now we will remove the ip from docker0 and then try starting the daemon
|
||||
ipCmd := exec.Command("ip", "addr", "flush", "dev", "docker0")
|
||||
stdout, stderr, _, err := runCommandWithStdoutStderr(ipCmd)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to remove docker0 IP association: %v, stdout: %q, stderr: %q", err, stdout, stderr)
|
||||
}
|
||||
|
||||
if err := d.Start(); err != nil {
|
||||
warning := "**WARNING: Docker bridge network in bad state--delete docker0 bridge interface to fix"
|
||||
t.Fatalf("Could not start daemon when docker0 has no IP address: %v\n%s", err, warning)
|
||||
}
|
||||
|
||||
// cleanup - stop the daemon if test passed
|
||||
if err := d.Stop(); err != nil {
|
||||
t.Fatalf("Could not stop daemon: %v", err)
|
||||
}
|
||||
|
||||
logDone("daemon - successful daemon start when bridge has no IP association")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user