daemon: remove graphdb usage

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
coolljt0725 · Jan 17, 2017 · b0f9958 · b0f9958
1 parent 05378f4
commit b0f9958
Show file tree

Hide file tree

Showing 29 changed files with 0 additions and 158,423 deletions.
diff --git a/daemon/container.go b/daemon/container.go
@@ -201,12 +201,6 @@ func (daemon *Daemon) setHostConfig(container *container.Container, hostConfig *
 		return err
 	}
 
-	// make sure links is not nil
-	// this ensures that on the next daemon restart we don't try to migrate from legacy sqlite links
-	if hostConfig.Links == nil {
-		hostConfig.Links = []string{}
-	}
-
 	container.HostConfig = hostConfig
 	return container.ToDisk()
 }

diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -187,7 +187,6 @@ func (daemon *Daemon) restore() error {
 		}
 	}
 
-	var migrateLegacyLinks bool // Not relevant on Windows
 	var wg sync.WaitGroup
 	var mapLock sync.Mutex
 	for _, c := range containers {
@@ -267,11 +266,6 @@ func (daemon *Daemon) restore() error {
 				c.SetDead()
 				c.ToDisk()
 			}
-
-			// if c.hostConfig.Links is nil (not just empty), then it is using the old sqlite links and needs to be migrated
-			if c.HostConfig != nil && c.HostConfig.Links == nil {
-				migrateLegacyLinks = true
-			}
 		}(c)
 	}
 	wg.Wait()
@@ -280,13 +274,6 @@ func (daemon *Daemon) restore() error {
 		return fmt.Errorf("Error initializing network controller: %v", err)
 	}
 
-	// Perform migration of legacy sqlite links (no-op on Windows)
-	if migrateLegacyLinks {
-		if err := daemon.sqliteMigration(containers); err != nil {
-			return err
-		}
-	}
-
 	// Now that all the containers are registered, register the links
 	for _, c := range containers {
 		if err := daemon.registerLinks(c, c.HostConfig); err != nil {

diff --git a/daemon/links_linux.go b/daemon/links_linux.go
diff --git a/daemon/links_linux_test.go b/daemon/links_linux_test.go
diff --git a/daemon/links_notlinux.go b/daemon/links_notlinux.go
diff --git a/pkg/graphdb/conn_sqlite3_linux.go b/pkg/graphdb/conn_sqlite3_linux.go