Merge pull request #4518 from knight42/feat/btrfs-config-root-path

dmcgowan · web-flow · commit d4e78200d6da · 2020-09-03T11:12:27.000-07:00
feat(snapshot::btrfs): config root_path
diff --git a/cmd/containerd/builtins_btrfs_linux.go b/cmd/containerd/builtins_btrfs_linux.go
@@ -18,4 +18,4 @@
 
 package main
 
-import _ "github.com/containerd/containerd/snapshots/btrfs"
+import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"
diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go
@@ -26,31 +26,18 @@ import (
 	"strings"
 
 	"github.com/containerd/btrfs"
+	"github.com/containerd/continuity/fs"
+
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/storage"
-	"github.com/containerd/continuity/fs"
 
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
-func init() {
-	plugin.Register(&plugin.Registration{
-		ID:   "btrfs",
-		Type: plugin.SnapshotPlugin,
-		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = []ocispec.Platform{platforms.DefaultSpec()}
-			ic.Meta.Exports = map[string]string{"root": ic.Root}
-			return NewSnapshotter(ic.Root)
-		},
-	})
-}
-
 type snapshotter struct {
 	device string // device of the root
 	root   string // root provides paths for internal storage.
diff --git a/snapshots/btrfs/plugin/plugin.go b/snapshots/btrfs/plugin/plugin.go
@@ -0,0 +1,59 @@
+// +build linux,!no_btrfs
+
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package plugin
+
+import (
+	"errors"
+
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+
+	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/containerd/plugin"
+	"github.com/containerd/containerd/snapshots/btrfs"
+)
+
+// Config represents configuration for the btrfs plugin.
+type Config struct {
+	// Root directory for the plugin
+	RootPath string `toml:"root_path"`
+}
+
+func init() {
+	plugin.Register(&plugin.Registration{
+		ID:     "btrfs",
+		Type:   plugin.SnapshotPlugin,
+		Config: &Config{},
+		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
+			ic.Meta.Platforms = []ocispec.Platform{platforms.DefaultSpec()}
+
+			config, ok := ic.Config.(*Config)
+			if !ok {
+				return nil, errors.New("invalid btrfs configuration")
+			}
+
+			root := ic.Root
+			if len(config.RootPath) != 0 {
+				root = config.RootPath
+			}
+
+			ic.Meta.Exports = map[string]string{"root": root}
+			return btrfs.NewSnapshotter(root)
+		},
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`
`19`	`19`	`package main`
`20`	`20`
`21`		`-import _ "github.com/containerd/containerd/snapshots/btrfs"`
	`21`	`+import _ "github.com/containerd/containerd/snapshots/btrfs/plugin"`