From 1d2e073813fac61da4eda436b1a0e12c8a5cc6f7 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Thu, 30 Apr 2015 18:15:22 -0700
Subject: [PATCH] Embed ContainerConfig into Container.

The cluster configuration is now embedded into the container. It's
guaranteed to be correct (as in, generated by BuildContainerConfig) at
all times.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 cluster/container.go               |  1 +
 cluster/engine.go                  | 23 +++++++++++++++--------
 scheduler/node/node.go             |  6 +++---
 scheduler/strategy/binpack_test.go |  6 +++++-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/cluster/container.go b/cluster/container.go
index f52b061fcd..ad8004f912 100644
--- a/cluster/container.go
+++ b/cluster/container.go
@@ -6,6 +6,7 @@ import "github.com/samalba/dockerclient"
 type Container struct {
 	dockerclient.Container
 
+	Config *ContainerConfig
 	Info   dockerclient.ContainerInfo
 	Engine *Engine
 }
diff --git a/cluster/engine.go b/cluster/engine.go
index 6fec790125..933dd8e3b5 100644
--- a/cluster/engine.go
+++ b/cluster/engine.go
@@ -247,9 +247,13 @@ func (e *Engine) updateContainer(c dockerclient.Container, containers map[string
 		if err != nil {
 			return nil, err
 		}
+		// Convert the ContainerConfig from inspect into our own
+		// cluster.ContainerConfig.
+		container.Config = BuildContainerConfig(*info.Config)
+		container.Config.CpuShares = container.Config.CpuShares * 1024.0 / e.Cpus
+
+		// Save the entire inspect back into the container.
 		container.Info = *info
-		// real CpuShares -> nb of CPUs
-		container.Info.Config.CpuShares = container.Info.Config.CpuShares * 1024.0 / e.Cpus
 	}
 
 	// Update its internal state.
@@ -321,7 +325,7 @@ func (e *Engine) UsedMemory() int64 {
 	var r int64
 	e.RLock()
 	for _, c := range e.containers {
-		r += c.Info.Config.Memory
+		r += c.Config.Memory
 	}
 	e.RUnlock()
 	return r
@@ -332,7 +336,7 @@ func (e *Engine) UsedCpus() int64 {
 	var r int64
 	e.RLock()
 	for _, c := range e.containers {
-		r += c.Info.Config.CpuShares
+		r += c.Config.CpuShares
 	}
 	e.RUnlock()
 	return r
@@ -356,12 +360,15 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (*
 		client = e.client
 	)
 
-	newConfig := *config
+	// Convert our internal ContainerConfig into something Docker will
+	// understand.  Start by making a copy of the internal ContainerConfig as
+	// we don't want to mess with the original.
+	dockerConfig := config.ContainerConfig
 
 	// nb of CPUs -> real CpuShares
-	newConfig.CpuShares = config.CpuShares * 1024 / e.Cpus
+	dockerConfig.CpuShares = config.CpuShares * 1024 / e.Cpus
 
-	if id, err = client.CreateContainer(&newConfig.ContainerConfig, name); err != nil {
+	if id, err = client.CreateContainer(&dockerConfig, name); err != nil {
 		// If the error is other than not found, abort immediately.
 		if err != dockerclient.ErrNotFound || !pullImage {
 			return nil, err
@@ -371,7 +378,7 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (*
 			return nil, err
 		}
 		// ...And try agaie.
-		if id, err = client.CreateContainer(&newConfig.ContainerConfig, name); err != nil {
+		if id, err = client.CreateContainer(&dockerConfig, name); err != nil {
 			return nil, err
 		}
 	}
diff --git a/scheduler/node/node.go b/scheduler/node/node.go
index ce85af930a..c7ab6b19d9 100644
--- a/scheduler/node/node.go
+++ b/scheduler/node/node.go
@@ -72,9 +72,9 @@ func (n *Node) Container(IDOrName string) *cluster.Container {
 
 // AddContainer inject a container into the internal state.
 func (n *Node) AddContainer(container *cluster.Container) error {
-	if container.Info.Config != nil {
-		memory := container.Info.Config.Memory
-		cpus := container.Info.Config.CpuShares
+	if container.Config != nil {
+		memory := container.Config.Memory
+		cpus := container.Config.CpuShares
 		if n.TotalMemory-memory < 0 || n.TotalCpus-cpus < 0 {
 			return errors.New("not enough resources")
 		}
diff --git a/scheduler/strategy/binpack_test.go b/scheduler/strategy/binpack_test.go
index 14c07de0a2..a6711d13a6 100644
--- a/scheduler/strategy/binpack_test.go
+++ b/scheduler/strategy/binpack_test.go
@@ -27,7 +27,11 @@ func createConfig(memory int64, cpus int64) *cluster.ContainerConfig {
 }
 
 func createContainer(ID string, config *cluster.ContainerConfig) *cluster.Container {
-	return &cluster.Container{Container: dockerclient.Container{Id: ID}, Info: dockerclient.ContainerInfo{Config: &config.ContainerConfig}}
+	return &cluster.Container{
+		Container: dockerclient.Container{Id: ID},
+		Config:    config,
+		Info:      dockerclient.ContainerInfo{Config: &config.ContainerConfig},
+	}
 }
 
 func TestPlaceEqualWeight(t *testing.T) {