Skip to content

Commit

Permalink
Merge pull request #4942 from petermattis/pmattis/docker-dns
Browse files Browse the repository at this point in the history
acceptance: fix sporadic DNS problems
  • Loading branch information
petermattis committed Mar 7, 2016
2 parents cb91fdb + 8482f5b commit 51278c0
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions acceptance/cluster/localcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,9 @@ func (l *LocalCluster) createRoach(node *testNode, vols *Container, cmd ...strin
defaultTCP: {},
},
Entrypoint: entrypoint,
Cmd: cmd,
// TODO(pmattis): Figure out why the Go DNS resolver is misbehaving.
Env: []string{"GODEBUG=netdns=cgo"},
Cmd: cmd,
Labels: map[string]string{
// Allow for `docker ps --filter label=Hostname=roach0` or `--filter label=Roach`.
"Hostname": hostname,
Expand Down Expand Up @@ -425,14 +427,13 @@ func (l *LocalCluster) startNode(node *testNode) {
}
l.createRoach(node, l.vols, cmd...)
maybePanic(node.Start())
// Infof doesn't take positional parameters, hence the Sprintf.
log.Infof(fmt.Sprintf(`*** started %[1]s ***
log.Infof(`*** started %[1]s ***
ui: %[2]s
trace: %[2]s/debug/requests
logs: %[3]s/cockroach.INFO
pprof: docker exec -it %[4]s /bin/bash -c 'go tool pprof /cockroach <(wget --no-check-certificate -qO- https://$(hostname):%[5]s/debug/pprof/heap)'
cockroach: %[6]s`,
node.Name(), "https://"+node.Addr().String(), locallogDir, node.Container.id[:5], base.DefaultPort, cmd))
node.Name(), "https://"+node.Addr().String(), locallogDir, node.Container.id[:5], base.DefaultPort, cmd)
}

func (l *LocalCluster) processEvent(event events.Message) bool {
Expand Down

0 comments on commit 51278c0

Please sign in to comment.