vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

snapshot/btrfs: update btrfs to snappshotter

Browse source 
Updates the btrfs snapshotter to meet the interface and current tests.
Mostly, we merge the keyspace into a common index. Like with the overlay
driver, we will still need to do more verification work to ensure
idempotence of key collisions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-02-07 17:21:19 -08:00
parent e6c1bb0ff2
commit 9c4b235954
No known key found for this signature in database
GPG key ID: 67B3DED84EDC823F
2 changed files with 177 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

8
snapshot/btrfs/btrfs_test.go
View file

@ -20,14 +20,14 @@ const (
func TestBtrfs(t *testing.T) {
testutil.RequiresRoot(t)
snapshot.DriverSuite(t, "Btrfs", func(root string) (snapshot.Driver, func(), error) {
snapshot.SnapshotterSuite(t, "Btrfs", func(root string) (snapshot.Snapshotter, func(), error) {
device := setupBtrfsLoopbackDevice(t, root)
driver, err := NewDriver(device.deviceName, root)
snapshotter, err := NewSnapshotter(device.deviceName, root)
if err != nil {
t.Fatal(err)
}
return driver, func() {
return snapshotter, func() {
device.remove(t)
}, nil
})
@ -53,7 +53,7 @@ func TestBtrfsMounts(t *testing.T) {
defer os.RemoveAll(root)
target := filepath.Join(root, "test")
b, err := NewDriver(device.deviceName, root)
b, err := NewSnapshotter(device.deviceName, root)
if err != nil {
t.Fatal(err)
}