Merge pull request #627 from mlaventure/fix-statedir

Ensure state dir is created before starting server

containerd/main.go

@@ -169,6 +169,10 @@ func main() {
 }
 
 func daemon(context *cli.Context) error {
+	stateDir := context.String("state-dir")
+	if err := os.MkdirAll(stateDir, 0755); err != nil {
+		return err
+	}
 	s := make(chan os.Signal, 2048)
 	signal.Notify(s, syscall.SIGTERM, syscall.SIGINT)
 	// Split the listen string of the form proto://addr
@@ -183,7 +187,7 @@ func daemon(context *cli.Context) error {
 		return err
 	}
 	sv, err := supervisor.New(
-		context.String("state-dir"),
+		stateDir,
 		context.String("runtime"),
 		context.String("shim"),
 		context.StringSlice("runtime-args"),

supervisor/supervisor.go

@@ -20,9 +20,6 @@ const (
 // New returns an initialized Process supervisor.
 func New(stateDir string, runtimeName, shimName string, runtimeArgs []string, timeout time.Duration, retainCount int) (*Supervisor, error) {
 	startTasks := make(chan *startTask, 10)
-	if err := os.MkdirAll(stateDir, 0755); err != nil {
-		return nil, err
-	}
 	machine, err := CollectMachineInformation()
 	if err != nil {
 		return nil, err