Update packages to match latest code in moby/pkg #100

rhatdan · 2017-09-08T12:15:21Z

Had to vendor in a new version of golang.org/x/net to build
Also had to make some changes to drivers to handle
archive.Reader -> io.Reader
archive.Archive -> io.ReadCloser

Also update .gitingore to ignore emacs files, containers-storage.*
and generated man pages.

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

rhatdan · 2017-09-08T12:19:45Z

@nalind PTAL
Just updateding pkg directory, needed for updates to overlay driver to support quota size.

rhatdan · 2017-09-08T15:29:05Z

@nalind Now passes tests. PTAL

nalind · 2017-09-08T20:24:18Z

.travis.yml

@@ -2,7 +2,6 @@ language: go
 go:
 - tip
 - 1.8
- - 1.7


Is dropping 1.7 necessary here?

No but why are we still doing it while everyone else has dropped it. runc/moby/cri-o ...
1.8 is supported on RHEL.

nalind · 2017-09-08T20:24:23Z

pkg/archive/changes.go

@@ -181,7 +181,7 @@ func changes(layers []string, rw string, dc deleteChange, sc skipChange) ([]Chan
 // If /foo/bar/file.txt is modified, then /foo/bar must be part of the changed files.
 // This block is here to ensure the change is recorded even if the
 // modify time, mode and size of the parent directory in the rw and ro layers are all equal.
- // Check https://github.com/docker/docker/pull/13590 for details.
+ // Check https://github.com/containers/storage/pull/13590 for details.


Probably want to leave this one alone.

nalind · 2017-09-08T20:24:27Z

pkg/chrootarchive/diff_unix.go

+ options.InUserNS = true
+ }
+
+ if tmpDir, err = ioutil.TempDir("/", "temp-docker-extract"); err != nil {


This reverts part of #17.

nalind · 2017-09-08T20:24:41Z

pkg/chrootarchive/diff_unix.go

@@ -98,7 +108,7 @@ func applyLayerHandler(dest string, layer archive.Reader, options *archive.TarOp
 return 0, fmt.Errorf("ApplyLayer json encode: %v", err)
 }

- cmd := reexec.Command("storage-applyLayer", dest)
+ cmd := reexec.Command("docker-applyLayer", dest)


This has to agree with pkg/chrootarchive/archive_unix.go.

nalind · 2017-09-08T20:24:48Z

pkg/devicemapper/devmapper_wrapper.go

 #include <libdevmapper.h>
 #include <linux/fs.h> // FIXME: present only for BLKGETSIZE64, maybe we can remove it?

 // FIXME: Can't we find a way to do the logging in pure Go?
-extern void StorageDevmapperLogCallback(int level, char *file, int line, int dm_errno_or_class, char *str);
+extern void DevmapperLogCallback(int level, char *file, int line, int dm_errno_or_class, char *str);


This reverts #14.

nalind · 2017-09-08T20:26:31Z

pkg/plugins/discovery.go

@@ -15,8 +15,7 @@ import (
 var (
 // ErrNotFound plugin not found
 ErrNotFound = errors.New("plugin not found")
- socketsPath = "/run/containers/storage/plugins"
- specsPaths = []string{"/etc/containers/storage/plugins", "/usr/lib/containers/storage/plugins"}
+ socketsPath = "/run/docker/plugins"


Do we want to make this change?

nalind · 2017-09-08T20:27:00Z

pkg/plugins/discovery_unix.go

+
+package plugins
+
+var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}


Does this need to be changed?

nalind · 2017-09-08T20:27:05Z

pkg/plugins/discovery_windows.go

+ "path/filepath"
+)
+
+var specsPaths = []string{filepath.Join(os.Getenv("programdata"), "docker", "plugins")}


Does this need to be changed?

nalind · 2017-09-08T20:27:56Z

It looks like some of the things we've changed in those files need to be reintegrated.

rhatdan · 2017-09-08T21:10:54Z

@nalind I think I made all of the sed 's/docker-/storage-/g' changes back in.

nalind · 2017-09-11T20:49:30Z

pkg/archive/archive_test.go

 if err == nil {
 t.Fatalf("UntarPath should throw an error if the destination if a file")
 }
 }

 // Do the same test as above but with the destination folder already exists
 // and the destination file is a directory
-// It's working, see https://github.com/docker/docker/issues/10040
+// It's working, see https://github.com/containers/storage/issues/10040


This one should be changed back.

nalind · 2017-09-11T20:49:33Z

pkg/archive/changes_test.go

@@ -191,14 +180,14 @@ func TestChangesWithChanges(t *testing.T) {
 checkChanges(expectedChanges, changes, t)
 }

-// See https://github.com/docker/docker/pull/13590
+// See https://github.com/containers/storage/pull/13590


This one should be changed back.

nalind · 2017-09-11T20:49:37Z

pkg/devicemapper/devmapper_log.go

+// in libdm (even debug ones because there's no way of setting the verbosity
+// level for an external logging callback).
+//export DevmapperLogCallback
+func DevmapperLogCallback(level C.int, file *C.char, line, dmErrnoOrClass C.int, message *C.char) {


We need to leave this rename in place, to avoid symbol multiply-defined errors when this version of the library is pulled in by a newer containers/image into dockerd, per #14.

Ok changed back

No, it needs to be left renamed to StorageDevmapperLogCallback, as it was before this PR.

nalind · 2017-09-11T20:49:40Z

pkg/plugins/discovery_unix_test.go

+ }
+
+ path := filepath.Join(tmpdir, "echo.spec")
+ addr := "unix://var/lib/docker/plugins/echo.sock"


Non-blocking: might want to move this. The spec file that points to the listening socket is still written in the location where the discovery logic looks, so this test passes, but it's a little confusing.

Changed to containers/storage

nalind · 2017-09-11T20:50:17Z

Mostly minor things around renaming, otherwise LGTM.

rhatdan · 2017-09-12T16:25:22Z

Will merge once tests pass.

Had to vendor in a new version of golang.org/x/net to build Also had to make some changes to drivers to handle archive.Reader -> io.Reader archive.Archive -> io.ReadCloser Also update .gitingore to ignore emacs files, containers-storage.* and generated man pages. Also no longer test travis against golang 1.7, cri-o, moby have also done this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

rhatdan · 2017-09-12T19:30:07Z

Tests pass, so merging.

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

Backport overlayxfs quota support from moby to cri-o

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

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

rhatdan force-pushed the master branch from 891c6f8 to 420166a Compare September 8, 2017 12:18

rhatdan force-pushed the master branch 4 times, most recently from 140cc44 to 48832b6 Compare September 8, 2017 15:05

nalind reviewed Sep 8, 2017

View reviewed changes

rhatdan force-pushed the master branch 3 times, most recently from 99570a1 to 02a6e7f Compare September 8, 2017 21:08

rhatdan force-pushed the master branch from 02a6e7f to 1c46c69 Compare September 9, 2017 13:35

nalind reviewed Sep 11, 2017

View reviewed changes

rhatdan force-pushed the master branch from 1c46c69 to 5b15548 Compare September 12, 2017 16:24

rhatdan force-pushed the master branch from 5b15548 to f39066f Compare September 12, 2017 18:00

rhatdan merged commit e3e3387 into containers:master Sep 12, 2017

rhatdan mentioned this pull request Sep 13, 2017

Pull fixes from moby/storage #104

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update packages to match latest code in moby/pkg #100

Update packages to match latest code in moby/pkg #100

rhatdan commented Sep 8, 2017 •

edited

Loading

rhatdan commented Sep 8, 2017

rhatdan commented Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind Sep 8, 2017

rhatdan Sep 8, 2017

nalind commented Sep 8, 2017

rhatdan commented Sep 8, 2017

nalind Sep 11, 2017

nalind Sep 11, 2017

rhatdan Sep 12, 2017

nalind Sep 11, 2017

rhatdan Sep 12, 2017

nalind Sep 12, 2017

nalind Sep 11, 2017

rhatdan Sep 12, 2017

nalind commented Sep 11, 2017

rhatdan commented Sep 12, 2017

rhatdan commented Sep 12, 2017

nalind commented Sep 14, 2017

nalind commented Sep 27, 2017

@@ @@ -2,7 +2,6 @@ language: go @@
 go:
  - tip
  - 1.8
- - 1.7


		package plugins

		var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}

Update packages to match latest code in moby/pkg #100

Update packages to match latest code in moby/pkg #100

Conversation

rhatdan commented Sep 8, 2017 • edited Loading

rhatdan commented Sep 8, 2017

rhatdan commented Sep 8, 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

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 8, 2017

rhatdan commented Sep 8, 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

nalind commented Sep 11, 2017

rhatdan commented Sep 12, 2017

rhatdan commented Sep 12, 2017

nalind commented Sep 14, 2017

nalind commented Sep 27, 2017

rhatdan commented Sep 8, 2017 •

edited

Loading