Merge pull request kubernetes#10694 from spowelljr/fixTruncatingLogs

Added WaitGroups to prevent stderr/stdout from being empty in error logs
hetong07 · Mar 4, 2021 · eaf5b58 · eaf5b58
2 parents 5da07f1 + b40a41d
commit eaf5b58
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/go.sum b/go.sum
@@ -753,7 +753,6 @@ github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJ
 github.com/otiai10/mint v1.3.0 h1:Ady6MKVezQwHBkGzLFbrsywyp09Ah7rkmfjV3Bcr5uc=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
 github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
@@ -856,7 +855,6 @@ github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKv
 github.com/spf13/cobra v0.0.2/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M=
 github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
@@ -1404,7 +1402,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -239,11 +239,13 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		bsutil.InvokeKubeadm(cfg.KubernetesConfig.KubernetesVersion), conf, extraFlags, strings.Join(ignore, ",")))
 	c.Stdout = kw
 	c.Stderr = kw
+	var wg sync.WaitGroup
+	wg.Add(1)
 	sc, err := k.c.StartCmd(c)
 	if err != nil {
 		return errors.Wrap(err, "start")
 	}
-	go outputKubeadmInitSteps(kr)
+	go outputKubeadmInitSteps(kr, &wg)
 	if _, err := k.c.WaitCmd(sc); err != nil {
 		if ctx.Err() == context.DeadlineExceeded {
 			return ErrInitTimedout
@@ -254,11 +256,12 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		}
 		return errors.Wrap(err, "wait")
 	}
+	kw.Close()
+	wg.Wait()
 	if err := k.applyCNI(cfg); err != nil {
 		return errors.Wrap(err, "apply cni")
 	}
 
-	var wg sync.WaitGroup
 	wg.Add(3)
 
 	go func() {
@@ -288,7 +291,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 }
 
 // outputKubeadmInitSteps streams the pipe and outputs the current step
-func outputKubeadmInitSteps(logs io.Reader) {
+func outputKubeadmInitSteps(logs io.Reader, wg *sync.WaitGroup) {
 	type step struct {
 		logTag       string
 		registerStep register.RegStep
@@ -316,6 +319,7 @@ func outputKubeadmInitSteps(logs io.Reader) {
 		out.Step(style.SubStep, nextStep.stepMessage)
 		nextStepIndex++
 	}
+	wg.Done()
 }
 
 // applyCNI applies CNI to a cluster. Needs to be done every time a VM is powered up.

diff --git a/pkg/minikube/command/command_runner.go b/pkg/minikube/command/command_runner.go
@@ -55,6 +55,7 @@ type RunResult struct {
 type StartedCmd struct {
 	cmd *exec.Cmd
 	rr  *RunResult
+	wg  *sync.WaitGroup
 }
 
 // Runner represents an interface to run commands.

diff --git a/pkg/minikube/command/ssh_runner.go b/pkg/minikube/command/ssh_runner.go
@@ -196,7 +196,7 @@ func (s *SSHRunner) RunCmd(cmd *exec.Cmd) (*RunResult, error) {
 }
 
 // teeSSHStart starts a non-blocking SSH command, streaming stdout, stderr to logs
-func teeSSHStart(s *ssh.Session, cmd string, outB io.Writer, errB io.Writer) error {
+func teeSSHStart(s *ssh.Session, cmd string, outB io.Writer, errB io.Writer, wg *sync.WaitGroup) error {
 	outPipe, err := s.StdoutPipe()
 	if err != nil {
 		return errors.Wrap(err, "stdout")
@@ -211,11 +211,13 @@ func teeSSHStart(s *ssh.Session, cmd string, outB io.Writer, errB io.Writer) err
 		if err := teePrefix(ErrPrefix, errPipe, errB, klog.V(8).Infof); err != nil {
 			klog.Errorf("tee stderr: %v", err)
 		}
+		wg.Done()
 	}()
 	go func() {
 		if err := teePrefix(OutPrefix, outPipe, outB, klog.V(8).Infof); err != nil {
 			klog.Errorf("tee stdout: %v", err)
 		}
+		wg.Done()
 	}()
 
 	return s.Start(cmd)
@@ -231,8 +233,10 @@ func (s *SSHRunner) StartCmd(cmd *exec.Cmd) (*StartedCmd, error) {
 		return nil, fmt.Errorf("another SSH command has been started and is currently running")
 	}
 
+	var wg sync.WaitGroup
+	wg.Add(2)
 	rr := &RunResult{Args: cmd.Args}
-	sc := &StartedCmd{cmd: cmd, rr: rr}
+	sc := &StartedCmd{cmd: cmd, rr: rr, wg: &wg}
 	klog.Infof("Start: %v", rr.Command())
 
 	var outb, errb io.Writer
@@ -258,7 +262,7 @@ func (s *SSHRunner) StartCmd(cmd *exec.Cmd) (*StartedCmd, error) {
 
 	s.s = sess
 
-	err = teeSSHStart(s.s, shellquote.Join(cmd.Args...), outb, errb)
+	err = teeSSHStart(s.s, shellquote.Join(cmd.Args...), outb, errb, &wg)
 
 	return sc, err
 }
@@ -276,6 +280,8 @@ func (s *SSHRunner) WaitCmd(sc *StartedCmd) (*RunResult, error) {
 		rr.ExitCode = exitError.ExitCode()
 	}
 
+	sc.wg.Wait()
+
 	if err := s.s.Close(); err != io.EOF {
 		klog.Errorf("session close: %v", err)
 	}