rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-03 07:54:14 +00:00
Code Issues Releases Wiki Activity

Set timeout on portchecker

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2018-04-19 16:03:14 +02:00
parent dd5b5e7e65
commit 74d38c4552
2 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
cluster/network.go
View File

@@ -1,14 +1,14 @@
package cluster
import (
"bufio"
"bytes"
"context"
"fmt"
"io"
"net"
"strings"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/stdcopy"
"github.com/docker/go-connections/nat"
"github.com/rancher/rke/docker"
"github.com/rancher/rke/hosts"
@@ -402,13 +402,16 @@ func (c *Cluster) runServicePortChecks(ctx context.Context) error {
}
func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList []string, planeHosts []*hosts.Host, image string, prsMap map[string]v3.PrivateRegistry) error {
hosts := []string{}
var hosts []string
var portCheckLogs []string
var containerStdout bytes.Buffer
var containerStderr bytes.Buffer
for _, host := range planeHosts {
hosts = append(hosts, host.InternalAddress)
}
imageCfg := &container.Config{
Image: image,
Tty: true,
Env: []string{
fmt.Sprintf("HOSTS=%s", strings.Join(hosts, " ")),
fmt.Sprintf("PORTS=%s", strings.Join(portList, " ")),
@@ -416,11 +419,14 @@ func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList
Cmd: []string{
"sh",
"-c",
"for host in $HOSTS; do for port in $PORTS ; do nc -z $host $port > /dev/null || echo $host $port ; done; done",
"for host in $HOSTS; do for port in $PORTS ; do echo \"Checking host ${host} on port ${port}\" >&1 & nc -w 5 -z $host $port > /dev/null || echo \"${host}:${port}\" >&2 & done; wait; done",
},
}
hostCfg := &container.HostConfig{
NetworkMode: "host",
LogConfig: container.LogConfig{
Type: "json-file",
},
}
if err := docker.DoRemoveContainer(ctx, host.DClient, PortCheckContainer, host.Address); err != nil {
return err
@@ -428,42 +434,28 @@ func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList
if err := docker.DoRunContainer(ctx, host.DClient, imageCfg, hostCfg, PortCheckContainer, host.Address, "network", prsMap); err != nil {
return err
}
if err := docker.WaitForContainer(ctx, host.DClient, host.Address, PortCheckContainer); err != nil {
return err
}
logs, err := docker.ReadContainerLogs(ctx, host.DClient, PortCheckContainer)
clogs, err := docker.ReadContainerLogs(ctx, host.DClient, PortCheckContainer)
if err != nil {
return err
}
defer logs.Close()
defer clogs.Close()
stdcopy.StdCopy(&containerStdout, &containerStderr, clogs)
containerLog := containerStderr.String()
logrus.Debugf("[network] containerLog [%s] on host: %s", containerLog, host.Address)
if err := docker.RemoveContainer(ctx, host.DClient, host.Address, PortCheckContainer); err != nil {
return err
}
portCheckLogs, err := getPortCheckLogs(logs)
if err != nil {
return err
}
if len(portCheckLogs) > 0 {
return fmt.Errorf("[network] Port check for ports: [%s] failed on host: [%s]", strings.Join(portCheckLogs, ", "), host.Address)
logrus.Debugf("[network] Length of portCheckLogs is [%d] on host: %s", len(portCheckLogs), host.Address)
if len(containerLog) > 0 {
portCheckLogs := strings.Join(strings.Split(strings.TrimSpace(containerLog), "\n"), ", ")
return fmt.Errorf("[network] Port check for ports: [%s] failed on host: [%s]", portCheckLogs, host.Address)
}
return nil
}
func getPortCheckLogs(reader io.ReadCloser) ([]string, error) {
logLines := bufio.NewScanner(reader)
hostPortLines := []string{}
for logLines.Scan() {
logLine := strings.Split(logLines.Text(), " ")
hostPortLines = append(hostPortLines, fmt.Sprintf("%s:%s", logLine[0], logLine[1]))
}
if err := logLines.Err(); err != nil {
return nil, err
}
return hostPortLines, nil
}
func getPortBindings(hostAddress string, portList []string) []nat.PortBinding {
portBindingList := []nat.PortBinding{}
for _, portNumber := range portList {

3
docker/docker.go
View File

@@ -333,8 +333,7 @@ func ReadFileFromContainer(ctx context.Context, dClient *client.Client, hostname
}
func ReadContainerLogs(ctx context.Context, dClient *client.Client, containerName string) (io.ReadCloser, error) {
return dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{ShowStdout: true})
return dClient.ContainerLogs(ctx, containerName, types.ContainerLogsOptions{Follow: true, ShowStdout: true, ShowStderr: true, Timestamps: false})
}
func tryRegistryAuth(pr v3.PrivateRegistry) types.RequestPrivilegeFunc {