Resurrect State directory

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

server/config.go

@@ -11,6 +11,8 @@ import (
 type Config struct {
 	// Root is the path to a directory where containerd will store persistent data
 	Root string `toml:"root"`
+	// State is the path to a directory where containerd will store transient data
+	State string `toml:"state"`
 	// GRPC configuration settings
 	GRPC GRPCConfig `toml:"grpc"`
 	// Debug and profiling settings

server/server.go

@@ -36,9 +36,15 @@ func New(ctx context.Context, config *Config) (*Server, error) {
 	if config.Root == "" {
 		return nil, errors.New("root must be specified")
 	}
+	if config.State == "" {
+		return nil, errors.New("state must be specified")
+	}
 	if err := os.MkdirAll(config.Root, 0711); err != nil {
 		return nil, err
 	}
+	if err := os.MkdirAll(config.State, 0711); err != nil {
+		return nil, err
+	}
 	if err := apply(ctx, config); err != nil {
 		return nil, err
 	}
@@ -66,6 +72,7 @@ func New(ctx context.Context, config *Config) (*Server, error) {
 			ctx,
 			initialized,
 			config.Root,
+			config.State,
 			id,
 		)
 		initContext.Events = s.events

server/server_linux.go

@@ -9,6 +9,12 @@ import (
 )
 
 const (
+	// DefaultRootDir is the default location used by containerd to store
+	// persistent data
+	DefaultRootDir = "/var/lib/containerd"
+	// DefaultStateDir is the default location used by containerd to store
+	// transient data
+	DefaultStateDir = "/run/containerd"
 	// DefaultAddress is the default unix socket address
 	DefaultAddress = "/run/containerd/containerd.sock"
 	// DefaultDebuggAddress is the default unix socket address for pprof data

server/server_unsupported.go

@@ -5,6 +5,12 @@ package server
 import "context"
 
 const (
+	// DefaultRootDir is the default location used by containerd to store
+	// persistent data
+	DefaultRootDir = "/var/lib/containerd"
+	// DefaultStateDir is the default location used by containerd to store
+	// transient data
+	DefaultStateDir = "/run/containerd"
 	// DefaultAddress is the default unix socket address
 	DefaultAddress = "/run/containerd/containerd.sock"
 	// DefaultDebuggAddress is the default unix socket address for pprof data

server/server_windows.go

@@ -2,7 +2,20 @@
 
 package server
 
-import "context"
+import (
+	"context"
+	"os"
+	"path/filepath"
+)
+
+var (
+	// DefaultRootDir is the default location used by containerd to store
+	// persistent data
+	DefaultRootDir = filepath.Join(os.Getenv("programfiles"), "containerd", "root")
+	// DefaultStateDir is the default location used by containerd to store
+	// transient data
+	DefaultStateDir = filepath.Join(os.Getenv("programfiles"), "containerd", "state")
+)
 
 const (
 	// DefaultAddress is the default winpipe address