Merge pull request containerd#48 from jterry75/automanage_vhd_cleanup

Remove automange-vhd's on ContainerCreate failure

Author: jterry75

pkg/server/container_create_windows.go

@@ -20,6 +20,7 @@ package server
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -35,6 +36,7 @@ import (
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
@@ -157,6 +159,11 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to generate container %q spec", id)
 	}
+	defer func() {
+		if retErr != nil {
+			cleanupAutomanageVhdFiles(ctx, id, sandboxID, config)
+		}
+	}()
 
 	log.G(ctx).Debugf("Container %q spec: %#+v", id, spew.NewFormatter(spec))
 
@@ -472,3 +479,41 @@ func setOCIDevicesPrivileged(g *generator) error {
 	g.AddAnnotation("io.microsoft.virtualmachine.lcow.privileged", "true")
 	return nil
 }
+
+// cleanupAutomanageVhdFiles is used to remove any automanage-vhd:// HostPaths
+// that were created as part of the ContainerCreate call that resulted in a
+// failure. This is because the expectation of the mount is that it will be
+// controlled in the lifetime of the shim that owns the container but if the
+// container fails activation it is unclear what stage that may have happened.
+// So only CRI can clean up the file copies that it did.
+func cleanupAutomanageVhdFiles(ctx context.Context, id, sandboxID string, config *runtime.ContainerConfig) {
+	automanageVhdIndex := 0
+	for _, m := range config.GetMounts() {
+		if strings.HasPrefix(m.HostPath, "automanage-vhd://") {
+			if formattedSource, err := filepath.EvalSymlinks(strings.TrimPrefix(m.HostPath, "automanage-vhd://")); err != nil {
+				log.G(ctx).WithFields(logrus.Fields{
+					"path":          m.HostPath,
+					logrus.ErrorKey: err,
+				}).Warn("failed to EvalSymlinks for automanage-vhd://")
+			} else {
+				if s, err := os.Stat(formattedSource); err != nil {
+					log.G(ctx).WithFields(logrus.Fields{
+						"path":          formattedSource,
+						logrus.ErrorKey: err,
+					}).Warn("failed to Stat automanage-vhd://")
+				} else {
+					if s.IsDir() {
+						formattedSource = filepath.Join(formattedSource, fmt.Sprintf("%s-%s.%d.vhdx", sandboxID, id, automanageVhdIndex))
+						automanageVhdIndex++
+					}
+					if err := os.Remove(formattedSource); err != nil && !os.IsNotExist(err) {
+						log.G(ctx).WithFields(logrus.Fields{
+							"path":          formattedSource,
+							logrus.ErrorKey: err,
+						}).Warn("failed to remove automanage-vhd://")
+					}
+				}
+			}
+		}
+	}
+}