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

Random-Liu · web-flow · commit 40007b34d36f · 2018-06-20T16:45:32.000-07:00
Fix snapshotter nil panic.
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)
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,10 @@ func NewCRIService(config criconfig.Config, client *containerd.Client) (CRIServi`
`128`	`128`	`selinux.SetDisabled()`
`129`	`129`	`}`
`130`	`130`
	`131`	`+ if client.SnapshotService(c.config.ContainerdConfig.Snapshotter) == nil {`
	`132`	`+ return nil, errors.Errorf("failed to find snapshotter %q", c.config.ContainerdConfig.Snapshotter)`
	`133`	`+ }`
	`134`	`+`
`131`	`135`	`c.imageFSPath = imageFSPath(config.ContainerdRootDir, config.ContainerdConfig.Snapshotter)`
`132`	`136`	`logrus.Infof("Get image filesystem path %q", c.imageFSPath)`
`133`	`137`