diff --git a/cluster/node.go b/cluster/node.go index 675ceecced..509905acca 100644 --- a/cluster/node.go +++ b/cluster/node.go @@ -270,11 +270,11 @@ func (n *Node) ReservedCpus() int64 { return r } -func (n *Node) OverCommitedMemory() int64 { +func (n *Node) UsableMemory() int64 { return n.Memory + (n.Memory * n.overcommitRatio / 100) } -func (n *Node) OverCommitedCpus() int64 { +func (n *Node) UsableCpus() int64 { return n.Cpus + (n.Cpus * n.overcommitRatio / 100) } diff --git a/cluster/node_test.go b/cluster/node_test.go index 723e679c41..173b5921d9 100644 --- a/cluster/node_test.go +++ b/cluster/node_test.go @@ -187,22 +187,22 @@ func TestCreateContainer(t *testing.T) { assert.Len(t, node.Containers(), 2) } -func TestOverCommitedMemory(t *testing.T) { +func TestUsableMemory(t *testing.T) { node := NewNode("test", 105) node.Memory = 1024 - assert.Equal(t, node.OverCommitedMemory(), 1024+1024*5/100) + assert.Equal(t, node.UsableMemory(), 1024+1024*5/100) node = NewNode("test", 90) node.Memory = 1024 - assert.Equal(t, node.OverCommitedMemory(), 1024-1024*10/100) + assert.Equal(t, node.UsableMemory(), 1024-1024*10/100) } -func TestOverCommitedCpus(t *testing.T) { +func TestUsableCpus(t *testing.T) { node := NewNode("test", 105) node.Cpus = 2 - assert.Equal(t, node.OverCommitedCpus(), 2+2*5/100) + assert.Equal(t, node.UsableCpus(), 2+2*5/100) node = NewNode("test", 90) node.Cpus = 2 - assert.Equal(t, node.OverCommitedCpus(), 2-2*10/100) + assert.Equal(t, node.UsableCpus(), 2-2*10/100) } diff --git a/scheduler/strategy/binpacking.go b/scheduler/strategy/binpacking.go index dad565d1d2..9dba25a19d 100644 --- a/scheduler/strategy/binpacking.go +++ b/scheduler/strategy/binpacking.go @@ -22,8 +22,8 @@ func (p *BinPackingPlacementStrategy) PlaceContainer(config *dockerclient.Contai scores := scores{} for _, node := range nodes { - nodeMemory := node.OverCommitedMemory() - nodeCpus := node.OverCommitedCpus() + nodeMemory := node.UsableMemory() + nodeCpus := node.UsableCpus() // Skip nodes that are smaller than the requested resources. if nodeMemory < int64(config.Memory) || nodeCpus < config.CpuShares {