Grab changes form moby/moby/graphdriver for overlay quota #98

rhatdan · 2017-09-07T11:48:47Z

This led to lots of packages being updated from moby
I tried not to pull in the snap driver stuff.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

rhatdan · 2017-09-07T12:01:38Z

The goal of this patch set is to satisfy #97

rhatdan · 2017-09-07T12:13:56Z

@nalind @rhvgoyal @mrunalp @runcom PTAL

runcom · 2017-09-07T12:17:23Z

looks good (assuming travis will pass) and the integration with CRI-O is smooth :) (and as long as overlay quota works)

TomSweeneyRedHat · 2017-09-07T13:33:32Z

drivers/aufs/aufs_test.go

+ t.Fatalf("Error should not be nil because dirs with id 1 should be deleted: %s", p)
+ }
+ if _, err := os.Stat(path.Join(tmp, p, "1-removing")); err == nil {
+ t.Fatalf("Error should not be nil because dirs with id 1-removing should be deleted: %s", p)


I'm back and forth. Should 1-removing be '1-removing'? Just to set it off more quickly?

We don't support aufs anyways, This code is just copied from Moby

rhatdan · 2017-09-07T14:11:58Z

@runcom a lot of "if's"

runcom · 2017-09-07T14:17:01Z

@runcom a lot of "if's"

well, it's still marked WIP :) I'll take a better look once it looks ready for you for sure :)

TomSweeneyRedHat · 2017-09-07T14:25:32Z

pkg/idtools/idtools_windows.go

@@ -5,14 +5,21 @@ package idtools
 import (
 "os"

- "github.com/containers/storage/pkg/system"
+ "github.com/docker/docker/pkg/system"


Is this change right?

nalind · 2017-09-07T15:25:18Z

The first patch in the series also removes a couple of packages from the vendor directory, so it should mention that, and might as well remove them from vendor.conf.

rhatdan · 2017-09-08T15:47:31Z

@nalind @rhvgoyal @mrunalp @runcom Tests are passing now, PTAL

nalind · 2017-09-14T17:32:42Z

Backport overlayxfs quota support from moby to cri-o

nalind · 2017-09-26T19:18:00Z

drivers/overlay/overlay.go

- if c := d.ctr.Decrement(mergedDir); c <= 0 {
- syscall.Unmount(mergedDir, 0)
+ if retErr != nil {
+ if err != nil {


We're switching from checking err to checking retErr here, so this line and its matching closing brace shouldn't be here.

Yup I screwed this patch up. Will push the correct change from upstream.

nalind · 2017-09-26T19:55:43Z

drivers/aufs/aufs_test.go

@@ -31,7 +33,7 @@ func init() {
 func testInit(dir string, t testing.TB) graphdriver.Driver {
 d, err := Init(dir, nil, nil, nil)
 if err != nil {
- if errors.Cause(err) == graphdriver.ErrNotSupported {
+ if err == graphdriver.ErrNotSupported {


Should keep unwrapping here, per #73.

nalind · 2017-09-26T20:07:21Z

drivers/aufs/aufs.go

@@ -567,14 +664,14 @@ func (a *Driver) aufsMount(ro []string, rw, target, mountLabel string) (err erro
 // version of aufs.
 func useDirperm() bool {
 enableDirpermLock.Do(func() {
- base, err := ioutil.TempDir("", "storage-aufs-base")
+ base, err := ioutil.TempDir("", "docker-aufs-base")


Did we lose a rename here?

nalind · 2017-09-26T20:07:24Z

drivers/aufs/aufs.go

 if err != nil {
 logrus.Errorf("error checking dirperm1: %v", err)
 return
 }
 defer os.RemoveAll(base)

- union, err := ioutil.TempDir("", "storage-aufs-union")
+ union, err := ioutil.TempDir("", "docker-aufs-union")


Did we lose a rename here?

nalind · 2017-09-26T20:17:19Z

drivers/devmapper/deviceset.go

 // "reg-" stands for "regular file".
 // In the future we might use "dev-" for "device file", etc.
- // container-maj,min[-inode] stands for:
- // - Managed by container storage
+ // storage-maj,min[-inode] stands for:


Nit: comment doesn't match the string below.

Changes to container

nalind · 2017-09-26T20:40:18Z

Okay, I think the current state of things answers all of my comments, so LGTM.

rhatdan · 2017-09-26T20:41:43Z

Ok I will squash the commits and push again.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

We don't support plugin drivers in containers/storage at this time. Remove them so we don't have to maintain them. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Need this driver to get overlay quota on xfs support Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

nalind · 2017-09-27T13:41:50Z

(8) Containers/storage needs to back port moby/moby support for quota support.

rhatdan force-pushed the quota branch from 672ea70 to b1b1254 Compare September 7, 2017 11:59

rhatdan force-pushed the quota branch from b1b1254 to ceb1909 Compare September 7, 2017 12:11

rhatdan changed the title ~~[WIP] We want to grab changes form moby/moby/graphdriver for overlay quota …~~ [WIP] Grab changes form moby/moby/graphdriver for overlay quota Sep 7, 2017

TomSweeneyRedHat reviewed Sep 7, 2017

View reviewed changes

rhatdan force-pushed the quota branch 2 times, most recently from f383f66 to 915c36c Compare September 7, 2017 14:11

TomSweeneyRedHat reviewed Sep 7, 2017

View reviewed changes

rhatdan force-pushed the quota branch from 915c36c to 30e8fa4 Compare September 7, 2017 15:06

rhatdan force-pushed the quota branch 7 times, most recently from 16afb3f to 16b2e77 Compare September 8, 2017 15:08

rhatdan force-pushed the quota branch 3 times, most recently from 10275f6 to 9a7e4cb Compare September 12, 2017 21:37

rhatdan mentioned this pull request Sep 13, 2017

Pull fixes from moby/storage #104

Closed

rhatdan force-pushed the quota branch 2 times, most recently from 0fa5dc5 to ba0a4bd Compare September 13, 2017 21:01

rhatdan force-pushed the quota branch from ba0a4bd to 15a1b5a Compare September 14, 2017 20:32

rhatdan force-pushed the quota branch 2 times, most recently from 98cedd0 to ddbbb01 Compare September 26, 2017 18:50

nalind reviewed Sep 26, 2017

View reviewed changes

rhatdan force-pushed the quota branch 2 times, most recently from 006238a to 493f385 Compare September 26, 2017 19:33

nalind reviewed Sep 26, 2017

View reviewed changes

rhatdan force-pushed the quota branch 2 times, most recently from bb053b3 to 051d108 Compare September 26, 2017 20:31

rhatdan added 13 commits September 26, 2017 20:45

Backport moby drivers general changes to containers/storage

57641cc

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby aufs driver changes to containers/storage

2dce2c3

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby btrfs driver changes to containers/storagea

4c17c25

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby devmapper driver changes to containers/storage

98c480e

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby graphtest changes to containers/storage

38e45fb

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby zfs changes to containers/storage

4c6ff0e

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby vfs changes to containers/storage

01a6d2b

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby windows changes to containers/storage

1eba391

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Remove pkg/plugins from containers/storage

b8ea56a

We don't support plugin drivers in containers/storage at this time. Remove them so we don't have to maintain them. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby overlay driver changes to containers/storage

e5f58bf

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Backport moby overlay driver changes to containers/storage

7cbf1ed

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Add moby quota driver into containers/storage

ca5ce1c

Need this driver to get overlay quota on xfs support Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Add size support for containers-storage.conf man page

5cbb75e

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

rhatdan force-pushed the quota branch from 051d108 to 5cbb75e Compare September 26, 2017 20:46

rhatdan merged commit 396aa50 into containers:master Sep 26, 2017

nalind mentioned this pull request Oct 3, 2017

Support quota for overlay2 #97

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Grab changes form moby/moby/graphdriver for overlay quota #98

Grab changes form moby/moby/graphdriver for overlay quota #98

rhatdan commented Sep 7, 2017 •

edited

Loading

rhatdan commented Sep 7, 2017

rhatdan commented Sep 7, 2017

runcom commented Sep 7, 2017

TomSweeneyRedHat Sep 7, 2017

rhatdan Sep 8, 2017

rhatdan commented Sep 7, 2017

runcom commented Sep 7, 2017

TomSweeneyRedHat Sep 7, 2017

rhatdan Sep 7, 2017

rhatdan Sep 7, 2017

nalind commented Sep 7, 2017

rhatdan commented Sep 8, 2017

nalind commented Sep 14, 2017

nalind Sep 26, 2017

rhatdan Sep 26, 2017

nalind Sep 26, 2017

rhatdan Sep 26, 2017

nalind Sep 26, 2017

rhatdan Sep 26, 2017

nalind Sep 26, 2017

rhatdan Sep 26, 2017

nalind Sep 26, 2017

rhatdan Sep 26, 2017

nalind commented Sep 26, 2017

rhatdan commented Sep 26, 2017

nalind commented Sep 27, 2017

Grab changes form moby/moby/graphdriver for overlay quota #98

Grab changes form moby/moby/graphdriver for overlay quota #98

Conversation

rhatdan commented Sep 7, 2017 • edited Loading

rhatdan commented Sep 7, 2017

rhatdan commented Sep 7, 2017

runcom commented Sep 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Sep 7, 2017

runcom commented Sep 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nalind commented Sep 7, 2017

rhatdan commented Sep 8, 2017

nalind commented Sep 14, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nalind commented Sep 26, 2017

rhatdan commented Sep 26, 2017

nalind commented Sep 27, 2017

rhatdan commented Sep 7, 2017 •

edited

Loading