Merge pull request #826 from Random-Liu/cherrypick-#821

Fix snapshotter nil panic.
containerd · Jun 20, 2018 · 40007b3 · 40007b3
2 parents 164ac36 + b9657c9
commit 40007b3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/server/service.go b/pkg/server/service.go
@@ -128,6 +128,10 @@ func NewCRIService(config criconfig.Config, client *containerd.Client) (CRIServi
 		selinux.SetDisabled()
 	}
 
+	if client.SnapshotService(c.config.ContainerdConfig.Snapshotter) == nil {
+		return nil, errors.Errorf("failed to find snapshotter %q", c.config.ContainerdConfig.Snapshotter)
+	}
+
 	c.imageFSPath = imageFSPath(config.ContainerdRootDir, config.ContainerdConfig.Snapshotter)
 	logrus.Infof("Get image filesystem path %q", c.imageFSPath)