Merge pull request #457 from kzys/duplicate-exec

Use codes.AlreadyExists correctly on Exec()

Author: kzys

agent/service.go

@@ -255,7 +255,7 @@ func (ts *TaskService) Create(requestCtx context.Context, req *taskAPI.CreateTas
 
 	resp, err := ts.taskManager.CreateTask(requestCtx, req, ts.runcService, ioConnectorSet)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to create runc shim")
+		return nil, err
 	}
 
 	logger.WithField("pid", resp.Pid).Debugf("create succeeded")

internal/vm/task.go

@@ -22,6 +22,8 @@ import (
 	"github.com/gogo/protobuf/types"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 const (
@@ -110,7 +112,7 @@ func (m *taskManager) newProc(taskID, execID string) (*vmProc, error) {
 
 	_, procExists := m.tasks[taskID][execID]
 	if procExists {
-		return nil, errors.Errorf("cannot add duplicate exec %q to task %q", execID, taskID)
+		return nil, status.Errorf(codes.AlreadyExists, "exec %q already exists", execID)
 	}
 
 	proc := &vmProc{}

runtime/service_integ_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/cio"
 	"github.com/containerd/containerd/containers"
+	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/ttrpcutil"
@@ -1666,12 +1667,21 @@ func TestExec_Isolated(t *testing.T) {
 	var execStdout bytes.Buffer
 	var execStderr bytes.Buffer
 
-	taskExec, err := task.Exec(ctx, "exec", &specs.Process{
+	const execID = "date"
+	taskExec, err := task.Exec(ctx, execID, &specs.Process{
 		Args: []string{"/bin/date"},
 		Cwd:  "/",
 	}, cio.NewCreator(cio.WithStreams(os.Stdin, &execStdout, &execStderr)))
 	require.NoError(t, err)
 
+	// Intentionally reuse execID.
+	_, err = task.Exec(ctx, execID, &specs.Process{
+		Args: []string{"/bin/date"},
+		Cwd:  "/",
+	}, cio.NewCreator(cio.WithStreams(os.Stdin, ioutil.Discard, ioutil.Discard)))
+	assert.Error(t, err)
+	assert.Truef(t, errdefs.IsAlreadyExists(err), "%q's cause must be %q", err, errdefs.ErrAlreadyExists)
+
 	execExitCh, err := taskExec.Wait(ctx)
 	require.NoError(t, err, "failed to wait on exec %s", "exec")