diff options
| author | Fabio Kung <fabio.kung@gmail.com> | 2017-04-10 09:54:29 -0700 |
|---|---|---|
| committer | Fabio Kung <fabio.kung@gmail.com> | 2017-06-23 07:52:34 -0700 |
| commit | 76d96418b13080514f3fb861072b06cb91d71cff (patch) | |
| tree | 617e4a7178003940804c1d887a06046673ab3d8a /daemon/daemon_unix_test.go | |
| parent | 66b231d598174986ad08236f0a38beb825e5a3c3 (diff) | |
| download | docker-76d96418b13080514f3fb861072b06cb91d71cff.tar.gz | |
avoid saving container state to disk before daemon.Register
Migrate legacy volumes (Daemon.verifyVolumesInfo) before containers are
registered on the Daemon, so state on disk is not overwritten and legacy
fields lost during registration.
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Diffstat (limited to 'daemon/daemon_unix_test.go')
| -rw-r--r-- | daemon/daemon_unix_test.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/daemon/daemon_unix_test.go b/daemon/daemon_unix_test.go index eb19376845..c3aa443e45 100644 --- a/daemon/daemon_unix_test.go +++ b/daemon/daemon_unix_test.go @@ -274,10 +274,6 @@ func TestMigratePre17Volumes(t *testing.T) { } `) - viewDB, err := container.NewViewDB() - if err != nil { - t.Fatal(err) - } volStore, err := store.New(volumeRoot) if err != nil { t.Fatal(err) @@ -289,10 +285,9 @@ func TestMigratePre17Volumes(t *testing.T) { volumedrivers.Register(drv, volume.DefaultDriverName) daemon := &Daemon{ - root: rootDir, - repository: containerRoot, - containersReplica: viewDB, - volumes: volStore, + root: rootDir, + repository: containerRoot, + volumes: volStore, } err = ioutil.WriteFile(filepath.Join(containerRoot, cid, "config.v2.json"), config, 600) if err != nil { |