docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX #3141 Refactor netstat command and tests 

Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
This commit is contained in:
Tiago Pires 2016-03-28 23:15:00 +01:00
parent 0d58079bf5
commit a6f19ef936
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmachine/provision/utils.go
View File

@ -250,10 +250,10 @@ func getFilesystemType(p Provisioner, directory string) (string, error) {
} }
func checkDaemonUp(p Provisioner, dockerPort int) func() bool { func checkDaemonUp(p Provisioner, dockerPort int) func() bool {
reDaemonListening := fmt.Sprintf(":%d.*LISTEN", dockerPort) reDaemonListening := fmt.Sprintf(":%d\\s+.*:.*", dockerPort)
return func() bool { return func() bool {
// HACK: Check netstat's output to see if anyone's listening on the Docker API port. // HACK: Check netstat's output to see if anyone's listening on the Docker API port.
netstatOut, err := p.SSHCommand("netstat -an") netstatOut, err := p.SSHCommand("netstat -tln")
if err != nil { if err != nil {
log.Warnf("Error running SSH command: %s", err) log.Warnf("Error running SSH command: %s", err)
return false return false

33
libmachine/provision/utils_test.go
View File

@ -17,23 +17,16 @@ import (
) )
var ( var (
reDaemonListening = ":2376.*LISTEN" reDaemonListening = ":2376\\s+.*:.*"
) )
func TestMatchNetstatOutMissing(t *testing.T) { func TestMatchNetstatOutMissing(t *testing.T) {
nsOut := `Active Internet connections (servers and established) nsOut := `Active Internet connections (servers and established)
Proto Recv-Q Send-Q Local Address Foreign Address State Proto Recv-Q Send-Q Local Address Foreign Address State
tcp 0 0 0.0.0.0:ssh 0.0.0.0:* LISTEN tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN
tcp 0 72 192.168.25.141:ssh 192.168.25.1:63213 ESTABLISHED tcp 0 0 0.0.0.0:237 0.0.0.0:* LISTEN
tcp 0 0 :::ssh :::* LISTEN tcp6 0 0 :::22 :::* LISTEN
Active UNIX domain sockets (servers and established) tcp6 0 0 :::23760 :::* LISTEN`
Proto RefCnt Flags Type State I-Node Path
unix 2 [ ACC ] STREAM LISTENING 17990 /var/run/acpid.socket
unix 2 [ ACC ] SEQPACKET LISTENING 14233 /run/udev/control
unix 3 [ ] STREAM CONNECTED 18688
unix 3 [ ] DGRAM 14243
unix 3 [ ] STREAM CONNECTED 18689
unix 3 [ ] DGRAM 14242`
if matchNetstatOut(reDaemonListening, nsOut) { if matchNetstatOut(reDaemonListening, nsOut) {
t.Fatal("Expected not to match the netstat output as showing the daemon listening but got a match") t.Fatal("Expected not to match the netstat output as showing the daemon listening but got a match")
} }
@ -42,19 +35,9 @@ unix 3 [ ] DGRAM 14242`
func TestMatchNetstatOutPresent(t *testing.T) { func TestMatchNetstatOutPresent(t *testing.T) {
nsOut := `Active Internet connections (servers and established) nsOut := `Active Internet connections (servers and established)
Proto Recv-Q Send-Q Local Address Foreign Address State Proto Recv-Q Send-Q Local Address Foreign Address State
tcp 0 0 0.0.0.0:ssh 0.0.0.0:* LISTEN tcp 0 0 0.0.0.0:22 0.0.0.0:* LISTEN
tcp 0 72 192.168.25.141:ssh 192.168.25.1:63235 ESTABLISHED tcp6 0 0 :::2376 :::* LISTEN
tcp 0 0 :::2376 :::* LISTEN tcp6 0 0 :::22 :::* LISTEN`
tcp 0 0 :::ssh :::* LISTEN
Active UNIX domain sockets (servers and established)
Proto RefCnt Flags Type State I-Node Path
unix 2 [ ACC ] STREAM LISTENING 17990 /var/run/acpid.socket
unix 2 [ ACC ] SEQPACKET LISTENING 14233 /run/udev/control
unix 2 [ ACC ] STREAM LISTENING 19365 /var/run/docker.sock
unix 3 [ ] STREAM CONNECTED 19774
unix 3 [ ] STREAM CONNECTED 19775
unix 3 [ ] DGRAM 14243
unix 3 [ ] DGRAM 14242`
if !matchNetstatOut(reDaemonListening, nsOut) { if !matchNetstatOut(reDaemonListening, nsOut) {
t.Fatal("Expected to match the netstat output as showing the daemon listening but didn't") t.Fatal("Expected to match the netstat output as showing the daemon listening but didn't")
} }