From 052ebaaf527b193514102eed5667ca8622679f49 Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 15 Nov 2013 15:48:24 -0800 Subject: [PATCH 1/2] Move all drivers to the same subdir graphdriver Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd Component: engine --- components/engine/{ => graphdriver}/aufs/aufs.go | 0 components/engine/{ => graphdriver}/aufs/aufs_test.go | 0 components/engine/{ => graphdriver}/aufs/dirs.go | 0 components/engine/{ => graphdriver}/aufs/mount.go | 0 components/engine/{ => graphdriver}/aufs/mount_darwin.go | 0 components/engine/{ => graphdriver}/aufs/mount_linux.go | 0 components/engine/{ => graphdriver}/devmapper/deviceset.go | 0 components/engine/{ => graphdriver}/devmapper/devmapper.go | 0 .../engine/{ => graphdriver}/devmapper/devmapper_log.go | 0 .../engine/{ => graphdriver}/devmapper/devmapper_test.go | 0 .../engine/{ => graphdriver}/devmapper/devmapper_wrapper.go | 0 .../devmapper/docker-device-tool/device_tool.go | 0 components/engine/{ => graphdriver}/devmapper/driver.go | 0 components/engine/{ => graphdriver}/devmapper/driver_test.go | 0 components/engine/{ => graphdriver}/devmapper/mount.go | 0 components/engine/runtime.go | 4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename components/engine/{ => graphdriver}/aufs/aufs.go (100%) rename components/engine/{ => graphdriver}/aufs/aufs_test.go (100%) rename components/engine/{ => graphdriver}/aufs/dirs.go (100%) rename components/engine/{ => graphdriver}/aufs/mount.go (100%) rename components/engine/{ => graphdriver}/aufs/mount_darwin.go (100%) rename components/engine/{ => graphdriver}/aufs/mount_linux.go (100%) rename components/engine/{ => graphdriver}/devmapper/deviceset.go (100%) rename components/engine/{ => graphdriver}/devmapper/devmapper.go (100%) rename components/engine/{ => graphdriver}/devmapper/devmapper_log.go (100%) rename components/engine/{ => graphdriver}/devmapper/devmapper_test.go (100%) rename components/engine/{ => graphdriver}/devmapper/devmapper_wrapper.go (100%) rename components/engine/{ => graphdriver}/devmapper/docker-device-tool/device_tool.go (100%) rename components/engine/{ => graphdriver}/devmapper/driver.go (100%) rename components/engine/{ => graphdriver}/devmapper/driver_test.go (100%) rename components/engine/{ => graphdriver}/devmapper/mount.go (100%) diff --git a/components/engine/aufs/aufs.go b/components/engine/graphdriver/aufs/aufs.go similarity index 100% rename from components/engine/aufs/aufs.go rename to components/engine/graphdriver/aufs/aufs.go diff --git a/components/engine/aufs/aufs_test.go b/components/engine/graphdriver/aufs/aufs_test.go similarity index 100% rename from components/engine/aufs/aufs_test.go rename to components/engine/graphdriver/aufs/aufs_test.go diff --git a/components/engine/aufs/dirs.go b/components/engine/graphdriver/aufs/dirs.go similarity index 100% rename from components/engine/aufs/dirs.go rename to components/engine/graphdriver/aufs/dirs.go diff --git a/components/engine/aufs/mount.go b/components/engine/graphdriver/aufs/mount.go similarity index 100% rename from components/engine/aufs/mount.go rename to components/engine/graphdriver/aufs/mount.go diff --git a/components/engine/aufs/mount_darwin.go b/components/engine/graphdriver/aufs/mount_darwin.go similarity index 100% rename from components/engine/aufs/mount_darwin.go rename to components/engine/graphdriver/aufs/mount_darwin.go diff --git a/components/engine/aufs/mount_linux.go b/components/engine/graphdriver/aufs/mount_linux.go similarity index 100% rename from components/engine/aufs/mount_linux.go rename to components/engine/graphdriver/aufs/mount_linux.go diff --git a/components/engine/devmapper/deviceset.go b/components/engine/graphdriver/devmapper/deviceset.go similarity index 100% rename from components/engine/devmapper/deviceset.go rename to components/engine/graphdriver/devmapper/deviceset.go diff --git a/components/engine/devmapper/devmapper.go b/components/engine/graphdriver/devmapper/devmapper.go similarity index 100% rename from components/engine/devmapper/devmapper.go rename to components/engine/graphdriver/devmapper/devmapper.go diff --git a/components/engine/devmapper/devmapper_log.go b/components/engine/graphdriver/devmapper/devmapper_log.go similarity index 100% rename from components/engine/devmapper/devmapper_log.go rename to components/engine/graphdriver/devmapper/devmapper_log.go diff --git a/components/engine/devmapper/devmapper_test.go b/components/engine/graphdriver/devmapper/devmapper_test.go similarity index 100% rename from components/engine/devmapper/devmapper_test.go rename to components/engine/graphdriver/devmapper/devmapper_test.go diff --git a/components/engine/devmapper/devmapper_wrapper.go b/components/engine/graphdriver/devmapper/devmapper_wrapper.go similarity index 100% rename from components/engine/devmapper/devmapper_wrapper.go rename to components/engine/graphdriver/devmapper/devmapper_wrapper.go diff --git a/components/engine/devmapper/docker-device-tool/device_tool.go b/components/engine/graphdriver/devmapper/docker-device-tool/device_tool.go similarity index 100% rename from components/engine/devmapper/docker-device-tool/device_tool.go rename to components/engine/graphdriver/devmapper/docker-device-tool/device_tool.go diff --git a/components/engine/devmapper/driver.go b/components/engine/graphdriver/devmapper/driver.go similarity index 100% rename from components/engine/devmapper/driver.go rename to components/engine/graphdriver/devmapper/driver.go diff --git a/components/engine/devmapper/driver_test.go b/components/engine/graphdriver/devmapper/driver_test.go similarity index 100% rename from components/engine/devmapper/driver_test.go rename to components/engine/graphdriver/devmapper/driver_test.go diff --git a/components/engine/devmapper/mount.go b/components/engine/graphdriver/devmapper/mount.go similarity index 100% rename from components/engine/devmapper/mount.go rename to components/engine/graphdriver/devmapper/mount.go diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 57e5498ff4..806ae69ed3 100644 --- a/components/engine/runtime.go +++ b/components/engine/runtime.go @@ -6,10 +6,10 @@ import ( "database/sql" "fmt" "github.com/dotcloud/docker/archive" - _ "github.com/dotcloud/docker/aufs" - _ "github.com/dotcloud/docker/devmapper" "github.com/dotcloud/docker/gograph" "github.com/dotcloud/docker/graphdriver" + _ "github.com/dotcloud/docker/graphdriver/aufs" + _ "github.com/dotcloud/docker/graphdriver/devmapper" _ "github.com/dotcloud/docker/graphdriver/dummy" "github.com/dotcloud/docker/utils" "io" From 73e6c3f45e35d148743ee9d5db2eba63c665ae0d Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Fri, 15 Nov 2013 15:55:45 -0800 Subject: [PATCH 2/2] rename gograph in graphdb Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a Component: engine --- components/engine/{gograph => graphdb}/MAINTAINERS | 0 .../{gograph/gograph.go => graphdb/graphdb.go} | 2 +- .../gograph_test.go => graphdb/graphdb_test.go} | 2 +- components/engine/{gograph => graphdb}/sort.go | 2 +- .../engine/{gograph => graphdb}/sort_test.go | 2 +- components/engine/{gograph => graphdb}/utils.go | 2 +- components/engine/runtime.go | 14 +++++++------- components/engine/server.go | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) rename components/engine/{gograph => graphdb}/MAINTAINERS (100%) rename components/engine/{gograph/gograph.go => graphdb/graphdb.go} (99%) rename components/engine/{gograph/gograph_test.go => graphdb/graphdb_test.go} (99%) rename components/engine/{gograph => graphdb}/sort.go (96%) rename components/engine/{gograph => graphdb}/sort_test.go (96%) rename components/engine/{gograph => graphdb}/utils.go (96%) diff --git a/components/engine/gograph/MAINTAINERS b/components/engine/graphdb/MAINTAINERS similarity index 100% rename from components/engine/gograph/MAINTAINERS rename to components/engine/graphdb/MAINTAINERS diff --git a/components/engine/gograph/gograph.go b/components/engine/graphdb/graphdb.go similarity index 99% rename from components/engine/gograph/gograph.go rename to components/engine/graphdb/graphdb.go index aa6a4126a0..9e2466b692 100644 --- a/components/engine/gograph/gograph.go +++ b/components/engine/graphdb/graphdb.go @@ -1,4 +1,4 @@ -package gograph +package graphdb import ( "database/sql" diff --git a/components/engine/gograph/gograph_test.go b/components/engine/graphdb/graphdb_test.go similarity index 99% rename from components/engine/gograph/gograph_test.go rename to components/engine/graphdb/graphdb_test.go index 1a40fffce3..0c3e8670e0 100644 --- a/components/engine/gograph/gograph_test.go +++ b/components/engine/graphdb/graphdb_test.go @@ -1,4 +1,4 @@ -package gograph +package graphdb import ( _ "code.google.com/p/gosqlite/sqlite3" diff --git a/components/engine/gograph/sort.go b/components/engine/graphdb/sort.go similarity index 96% rename from components/engine/gograph/sort.go rename to components/engine/graphdb/sort.go index a0af6b4025..c07df077d8 100644 --- a/components/engine/gograph/sort.go +++ b/components/engine/graphdb/sort.go @@ -1,4 +1,4 @@ -package gograph +package graphdb import "sort" diff --git a/components/engine/gograph/sort_test.go b/components/engine/graphdb/sort_test.go similarity index 96% rename from components/engine/gograph/sort_test.go rename to components/engine/graphdb/sort_test.go index 40431039a5..ddf2266f60 100644 --- a/components/engine/gograph/sort_test.go +++ b/components/engine/graphdb/sort_test.go @@ -1,4 +1,4 @@ -package gograph +package graphdb import ( "testing" diff --git a/components/engine/gograph/utils.go b/components/engine/graphdb/utils.go similarity index 96% rename from components/engine/gograph/utils.go rename to components/engine/graphdb/utils.go index 4896242796..bdbcd79813 100644 --- a/components/engine/gograph/utils.go +++ b/components/engine/graphdb/utils.go @@ -1,4 +1,4 @@ -package gograph +package graphdb import ( "path" diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 806ae69ed3..8ae9b97d2e 100644 --- a/components/engine/runtime.go +++ b/components/engine/runtime.go @@ -6,7 +6,7 @@ import ( "database/sql" "fmt" "github.com/dotcloud/docker/archive" - "github.com/dotcloud/docker/gograph" + "github.com/dotcloud/docker/graphdb" "github.com/dotcloud/docker/graphdriver" _ "github.com/dotcloud/docker/graphdriver/aufs" _ "github.com/dotcloud/docker/graphdriver/devmapper" @@ -43,7 +43,7 @@ type Runtime struct { volumes *Graph srv *Server config *DaemonConfig - containerGraph *gograph.Database + containerGraph *graphdb.Database driver graphdriver.Driver } @@ -581,7 +581,7 @@ func (runtime *Runtime) Children(name string) (map[string]*Container, error) { } children := make(map[string]*Container) - err = runtime.containerGraph.Walk(name, func(p string, e *gograph.Entity) error { + err = runtime.containerGraph.Walk(name, func(p string, e *graphdb.Entity) error { c := runtime.Get(e.ID()) if c == nil { return fmt.Errorf("Could not get container for name %s and id %s", e.ID(), p) @@ -659,20 +659,20 @@ func NewRuntimeFromDirectory(config *DaemonConfig) (*Runtime, error) { return nil, err } - gographPath := path.Join(config.Root, "linkgraph.db") + graphdbPath := path.Join(config.Root, "linkgraph.db") initDatabase := false - if _, err := os.Stat(gographPath); err != nil { + if _, err := os.Stat(graphdbPath); err != nil { if os.IsNotExist(err) { initDatabase = true } else { return nil, err } } - conn, err := sql.Open("sqlite3", gographPath) + conn, err := sql.Open("sqlite3", graphdbPath) if err != nil { return nil, err } - graph, err := gograph.NewDatabase(conn, initDatabase) + graph, err := graphdb.NewDatabase(conn, initDatabase) if err != nil { return nil, err } diff --git a/components/engine/server.go b/components/engine/server.go index a973aa5d00..4852e2133f 100644 --- a/components/engine/server.go +++ b/components/engine/server.go @@ -8,7 +8,7 @@ import ( "github.com/dotcloud/docker/archive" "github.com/dotcloud/docker/auth" "github.com/dotcloud/docker/engine" - "github.com/dotcloud/docker/gograph" + "github.com/dotcloud/docker/graphdb" "github.com/dotcloud/docker/registry" "github.com/dotcloud/docker/utils" "io" @@ -502,7 +502,7 @@ func createAPIContainer(container *Container, size bool, runtime *Runtime) APICo ID: container.ID, } names := []string{} - runtime.containerGraph.Walk("/", func(p string, e *gograph.Entity) error { + runtime.containerGraph.Walk("/", func(p string, e *graphdb.Entity) error { if e.ID() == container.ID { names = append(names, p) }