Merge pull request #3179 from Random-Liu/publish-error

estesp · web-flow · commit eea500d12258 · 2019-04-04T20:35:34.000-04:00
Return event publish errors
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -59,6 +59,12 @@ var (
 	criuFlag             string
 	systemdCgroupFlag    bool
 	containerdBinaryFlag string
+
+	bufPool = sync.Pool{
+		New: func() interface{} {
+			return bytes.NewBuffer(nil)
+		},
+	}
 )
 
 func init() {
@@ -275,16 +281,20 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
 	}
 	cmd := exec.CommandContext(ctx, containerdBinaryFlag, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
 	cmd.Stdin = bytes.NewReader(data)
+	b := bufPool.Get().(*bytes.Buffer)
+	defer bufPool.Put(b)
+	cmd.Stdout = b
+	cmd.Stderr = b
 	c, err := shim.Default.Start(cmd)
 	if err != nil {
 		return err
 	}
 	status, err := shim.Default.Wait(cmd, c)
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "failed to publish event: %s", b.String())
 	}
 	if status != 0 {
-		return errors.New("failed to publish event")
+		return errors.Errorf("failed to publish event: %s", b.String())
 	}
 	return nil
 }
diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go
@@ -26,6 +26,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"sync"
 	"syscall"
 
 	"github.com/containerd/containerd/events"
@@ -37,6 +38,12 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+var bufPool = sync.Pool{
+	New: func() interface{} {
+		return bytes.NewBuffer(nil)
+	},
+}
+
 // setupSignals creates a new signal handler for all signals and sets the shim as a
 // sub-reaper so that the container processes are reparented
 func setupSignals(config Config) (chan os.Signal, error) {
@@ -106,12 +113,16 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
 	}
 	cmd := exec.CommandContext(ctx, l.containerdBinaryPath, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)
 	cmd.Stdin = bytes.NewReader(data)
+	b := bufPool.Get().(*bytes.Buffer)
+	defer bufPool.Put(b)
+	cmd.Stdout = b
+	cmd.Stderr = b
 	if l.noReaper {
 		if err := cmd.Start(); err != nil {
 			return err
 		}
 		if err := cmd.Wait(); err != nil {
-			return errors.Wrap(err, "failed to publish event")
+			return errors.Wrapf(err, "failed to publish event: %s", b.String())
 		}
 		return nil
 	}
@@ -121,10 +132,10 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event
 	}
 	status, err := Default.Wait(cmd, c)
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "failed to publish event: %s", b.String())
 	}
 	if status != 0 {
-		return errors.New("failed to publish event")
+		return errors.Errorf("failed to publish event: %s", b.String())
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@ var (`
`59`	`59`	`criuFlag string`
`60`	`60`	`systemdCgroupFlag bool`
`61`	`61`	`containerdBinaryFlag string`
	`62`	`+`
	`63`	`+ bufPool = sync.Pool{`
	`64`	`+ New: func() interface{} {`
	`65`	`+ return bytes.NewBuffer(nil)`
	`66`	`+ },`
	`67`	`+ }`
`62`	`68`	`)`
`63`	`69`
`64`	`70`	`func init() {`
`@@ -275,16 +281,20 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event`
`275`	`281`	`}`
`276`	`282`	`cmd := exec.CommandContext(ctx, containerdBinaryFlag, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)`
`277`	`283`	`cmd.Stdin = bytes.NewReader(data)`
	`284`	`+ b := bufPool.Get().(*bytes.Buffer)`
	`285`	`+ defer bufPool.Put(b)`
	`286`	`+ cmd.Stdout = b`
	`287`	`+ cmd.Stderr = b`
`278`	`288`	`c, err := shim.Default.Start(cmd)`
`279`	`289`	`if err != nil {`
`280`	`290`	`return err`
`281`	`291`	`}`
`282`	`292`	`status, err := shim.Default.Wait(cmd, c)`
`283`	`293`	`if err != nil {`
`284`		`- return err`
	`294`	`+ return errors.Wrapf(err, "failed to publish event: %s", b.String())`
`285`	`295`	`}`
`286`	`296`	`if status != 0 {`
`287`		`- return errors.New("failed to publish event")`
	`297`	`+ return errors.Errorf("failed to publish event: %s", b.String())`
`288`	`298`	`}`
`289`	`299`	`return nil`
`290`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`"os"`
`27`	`27`	`"os/exec"`
`28`	`28`	`"os/signal"`
	`29`	`+ "sync"`
`29`	`30`	`"syscall"`
`30`	`31`
`31`	`32`	`"github.com/containerd/containerd/events"`
`@@ -37,6 +38,12 @@ import (`
`37`	`38`	`"golang.org/x/sys/unix"`
`38`	`39`	`)`
`39`	`40`
	`41`	`+var bufPool = sync.Pool{`
	`42`	`+ New: func() interface{} {`
	`43`	`+ return bytes.NewBuffer(nil)`
	`44`	`+ },`
	`45`	`+}`
	`46`	`+`
`40`	`47`	`// setupSignals creates a new signal handler for all signals and sets the shim as a`
`41`	`48`	`// sub-reaper so that the container processes are reparented`
`42`	`49`	`func setupSignals(config Config) (chan os.Signal, error) {`
`@@ -106,12 +113,16 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event`
`106`	`113`	`}`
`107`	`114`	`cmd := exec.CommandContext(ctx, l.containerdBinaryPath, "--address", l.address, "publish", "--topic", topic, "--namespace", ns)`
`108`	`115`	`cmd.Stdin = bytes.NewReader(data)`
	`116`	`+ b := bufPool.Get().(*bytes.Buffer)`
	`117`	`+ defer bufPool.Put(b)`
	`118`	`+ cmd.Stdout = b`
	`119`	`+ cmd.Stderr = b`
`109`	`120`	`if l.noReaper {`
`110`	`121`	`if err := cmd.Start(); err != nil {`
`111`	`122`	`return err`
`112`	`123`	`}`
`113`	`124`	`if err := cmd.Wait(); err != nil {`
`114`		`- return errors.Wrap(err, "failed to publish event")`
	`125`	`+ return errors.Wrapf(err, "failed to publish event: %s", b.String())`
`115`	`126`	`}`
`116`	`127`	`return nil`
`117`	`128`	`}`
`@@ -121,10 +132,10 @@ func (l *remoteEventsPublisher) Publish(ctx context.Context, topic string, event`
`121`	`132`	`}`
`122`	`133`	`status, err := Default.Wait(cmd, c)`
`123`	`134`	`if err != nil {`
`124`		`- return err`
	`135`	`+ return errors.Wrapf(err, "failed to publish event: %s", b.String())`
`125`	`136`	`}`
`126`	`137`	`if status != 0 {`
`127`		`- return errors.New("failed to publish event")`
	`138`	`+ return errors.Errorf("failed to publish event: %s", b.String())`
`128`	`139`	`}`
`129`	`140`	`return nil`
`130`	`141`	`}`