rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 17:00:20 +00:00
Code Issues Releases Wiki Activity

Get latest logline if healthcheck fails

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2018-05-21 20:11:11 +02:00
committed by Alena Prokharchyk
parent 70fca52c33
commit aabce06714
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/network.go
View File

@@ -431,7 +431,7 @@ func checkPlaneTCPPortsFromHost(ctx context.Context, host *hosts.Host, portList
return err return err
} }
clogs, err := docker.ReadContainerLogs(ctx, host.DClient, PortCheckContainer) clogs, err := docker.ReadContainerLogs(ctx, host.DClient, PortCheckContainer, true, "all")
if err != nil { if err != nil {
return err return err
} }

4
docker/docker.go
View File

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

19
services/healthcheck.go
View File

@@ -1,6 +1,7 @@
package services package services
import ( import (
"bytes"
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
@@ -10,6 +11,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/docker/pkg/stdcopy"
"github.com/rancher/rke/docker"
"github.com/rancher/rke/hosts" "github.com/rancher/rke/hosts"
"github.com/rancher/rke/log" "github.com/rancher/rke/log"
"github.com/rancher/rke/pki" "github.com/rancher/rke/pki"
@@ -25,6 +28,9 @@ const (
) )
func runHealthcheck(ctx context.Context, host *hosts.Host, serviceName string, localConnDialerFactory hosts.DialerFactory, url string, certMap map[string]pki.CertificatePKI) error { func runHealthcheck(ctx context.Context, host *hosts.Host, serviceName string, localConnDialerFactory hosts.DialerFactory, url string, certMap map[string]pki.CertificatePKI) error {
var containerStderr bytes.Buffer
var containerStdout bytes.Buffer
log.Infof(ctx, "[healthcheck] Start Healthcheck on service [%s] on host [%s]", serviceName, host.Address) log.Infof(ctx, "[healthcheck] Start Healthcheck on service [%s] on host [%s]", serviceName, host.Address)
var x509Pair tls.Certificate var x509Pair tls.Certificate
@@ -61,7 +67,18 @@ func runHealthcheck(ctx context.Context, host *hosts.Host, serviceName string, l
log.Infof(ctx, "[healthcheck] service [%s] on host [%s] is healthy", serviceName, host.Address) log.Infof(ctx, "[healthcheck] service [%s] on host [%s] is healthy", serviceName, host.Address)
return nil return nil
} }
return fmt.Errorf("Failed to verify healthcheck: %v", err) logrus.Debug("Checking container logs")
clogs, logserr := docker.ReadContainerLogs(ctx, host.DClient, serviceName, false, "1")
defer clogs.Close()
if logserr != nil {
logrus.Debug("logserr: %v", logserr)
return fmt.Errorf("Failed to verify healthcheck: %v", err)
}
stdcopy.StdCopy(&containerStdout, &containerStderr, clogs)
containerLog := containerStderr.String()
containerLog = strings.TrimSuffix(containerLog, "\n")
return fmt.Errorf("Failed to verify healthcheck: %v, log: %v", err, containerLog)
} }
func getHealthCheckHTTPClient(host *hosts.Host, port int, localConnDialerFactory hosts.DialerFactory, x509KeyPair *tls.Certificate) (*http.Client, error) { func getHealthCheckHTTPClient(host *hosts.Host, port int, localConnDialerFactory hosts.DialerFactory, x509KeyPair *tls.Certificate) (*http.Client, error) {