Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tests update: portallocator_test #1723

Merged
merged 2 commits into from
Aug 4, 2020
Merged

Tests update: portallocator_test #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
951f589
portallocator tests fix
alexey-kremsa-globant Aug 4, 2020
a7af0e9
Merge branch 'master' into portallocator_tests
markmandel Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/gameservers/portallocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ func (pa *PortAllocator) Run(stop <-chan struct{}) error {
}

// Allocate assigns a port to the GameServer and returns it.
// Return ErrPortNotFound if no port is allocatable
Copy link
Collaborator

@aLekSer aLekSer Jul 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have just simulated what would be when we don't have enough free ports. In current version - it would be actually a warning, so error is redundant in that case:

11m         Warning   FailedScheduling          pod/simple-udp-qbx79-c2vll                           0/6 nodes are available: 2 node(s) had taints that the pod didn't tolerate, 4 node(s) didn't have free ports for the requested pod ports.

func (pa *PortAllocator) Allocate(gs *agonesv1.GameServer) *agonesv1.GameServer {
pa.mutex.Lock()
defer pa.mutex.Unlock()
Expand Down
110 changes: 67 additions & 43 deletions pkg/gameservers/portallocator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
agtesting "agones.dev/agones/pkg/testing"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -59,52 +60,53 @@ func TestPortAllocatorAllocate(t *testing.T) {
assert.True(t, cache.WaitForCacheSync(stop, pa.nodeSynced))

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

// single port dynamic
pa.Allocate(fixture.DeepCopy())
assert.Nil(t, err)
gs := pa.Allocate(fixture.DeepCopy())
require.NotNil(t, gs)
assert.Equal(t, 1, countTotalAllocatedPorts(pa))

pa.Allocate(fixture.DeepCopy())
assert.Nil(t, err)
gs = pa.Allocate(fixture.DeepCopy())
require.NotNil(t, gs)
assert.Equal(t, 2, countTotalAllocatedPorts(pa))

// double port, dynamic
gsCopy := fixture.DeepCopy()
gsCopy.Spec.Ports = append(gsCopy.Spec.Ports, agonesv1.GameServerPort{Name: "another", ContainerPort: 6666, PortPolicy: agonesv1.Dynamic})
assert.Len(t, gsCopy.Spec.Ports, 2)
pa.Allocate(gsCopy.DeepCopy())
assert.Nil(t, err)
require.Len(t, gsCopy.Spec.Ports, 2)
gs = pa.Allocate(gsCopy.DeepCopy())
require.NotNil(t, gs)
assert.Equal(t, 4, countTotalAllocatedPorts(pa))

// three ports, dynamic
gsCopy = gsCopy.DeepCopy()
gsCopy.Spec.Ports = append(gsCopy.Spec.Ports, agonesv1.GameServerPort{Name: "another", ContainerPort: 6666, PortPolicy: agonesv1.Dynamic})
assert.Len(t, gsCopy.Spec.Ports, 3)
pa.Allocate(gsCopy)
assert.Nil(t, err)
require.Len(t, gsCopy.Spec.Ports, 3)

gs = pa.Allocate(gsCopy)
require.NotNil(t, gs)
assert.Equal(t, 7, countTotalAllocatedPorts(pa))

// 4 ports, 1 static, rest dynamic
gsCopy = gsCopy.DeepCopy()
expected := int32(9999)
gsCopy.Spec.Ports = append(gsCopy.Spec.Ports, agonesv1.GameServerPort{Name: "another", ContainerPort: 6666, HostPort: expected, PortPolicy: agonesv1.Static})
assert.Len(t, gsCopy.Spec.Ports, 4)
pa.Allocate(gsCopy)
assert.Nil(t, err)
require.Len(t, gsCopy.Spec.Ports, 4)
gs = pa.Allocate(gsCopy)
require.NotNil(t, gs)
assert.Equal(t, 10, countTotalAllocatedPorts(pa))
assert.Equal(t, agonesv1.Static, gsCopy.Spec.Ports[3].PortPolicy)
assert.Equal(t, expected, gsCopy.Spec.Ports[3].HostPort)

// single port, passthrough
gsCopy = fixture.DeepCopy()
gsCopy.Spec.Ports[0] = agonesv1.GameServerPort{Name: "passthrough", PortPolicy: agonesv1.Passthrough}
assert.Len(t, gsCopy.Spec.Ports, 1)
pa.Allocate(gsCopy)

gs = pa.Allocate(gsCopy)
require.NotNil(t, gs)
assert.NotEmpty(t, gsCopy.Spec.Ports[0].HostPort)
assert.Equal(t, gsCopy.Spec.Ports[0].HostPort, gsCopy.Spec.Ports[0].ContainerPort)
assert.Nil(t, err)
assert.Equal(t, 11, countTotalAllocatedPorts(pa))
})

Expand All @@ -123,29 +125,30 @@ func TestPortAllocatorAllocate(t *testing.T) {
assert.True(t, cache.WaitForCacheSync(stop, pa.nodeSynced))

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

// two nodes
for x := 0; x < 2; x++ {
// ports between 10 and 20
for i := 10; i <= 20; i++ {
for i := 0; i < 11; i++ {
var p int32
gs := pa.Allocate(fixture.DeepCopy())
require.NotNil(t, gs)
assert.True(t, 10 <= gs.Spec.Ports[0].HostPort && gs.Spec.Ports[0].HostPort <= 20, "%v is not between 10 and 20", p)
assert.Nil(t, err)
}
}

assert.Len(t, pa.portAllocations, 2)
gs := pa.Allocate(fixture.DeepCopy())
require.NotNil(t, gs)
assert.NotEmpty(t, gs.Spec.Ports[0].HostPort)
assert.Len(t, pa.portAllocations, 3)
})

t.Run("ports are all allocated with multiple ports per GameServers", func(t *testing.T) {
m := agtesting.NewMocks()
maxPort := int32(19) // make sure we have an even number
pa := NewPortAllocator(10, maxPort, m.KubeInformerFactory, m.AgonesInformerFactory)
minPort := int32(10)
maxPort := int32(20)
pa := NewPortAllocator(minPort, maxPort, m.KubeInformerFactory, m.AgonesInformerFactory)
nodeWatch := watch.NewFake()
m.KubeClient.AddWatchReactor("nodes", k8stesting.DefaultWatchReactor(nodeWatch, nil))

Expand All @@ -158,23 +161,21 @@ func TestPortAllocatorAllocate(t *testing.T) {
agonesv1.GameServerPort{Name: "static", ContainerPort: 6666, PortPolicy: agonesv1.Static, HostPort: 9999},
agonesv1.GameServerPort{Name: "passthrough", PortPolicy: agonesv1.Passthrough})

assert.Len(t, morePortFixture.Spec.Ports, 4)

// Make sure the add's don't corrupt the sync
nodeWatch.Add(&n1)
nodeWatch.Add(&n2)
assert.True(t, cache.WaitForCacheSync(stop, pa.nodeSynced))

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

// two nodes
for x := 0; x < 2; x++ {
// ports between 10 and 20, but there are 2 ports
for i := 10; i <= 14; i++ {
for i := 0; i < 3; i++ {
gsCopy := morePortFixture.DeepCopy()
gsCopy.ObjectMeta.UID = types.UID(strconv.Itoa(x) + ":" + strconv.Itoa(i))
gs := pa.Allocate(gsCopy)
require.NotNil(t, gs)

// Dynamic
assert.NotEmpty(t, gs.Spec.Ports[0].HostPort)
Expand All @@ -185,8 +186,8 @@ func TestPortAllocatorAllocate(t *testing.T) {
assert.NotEmpty(t, passThrough.HostPort)
assert.Equal(t, passThrough.HostPort, passThrough.ContainerPort)

logrus.WithField("uid", gsCopy.ObjectMeta.UID).WithField("ports", gs.Spec.Ports).WithError(err).Info("Allocated Port")
assert.Nil(t, err)
logrus.WithField("uid", gsCopy.ObjectMeta.UID).WithField("ports", gs.Spec.Ports).Info("Allocated Port")

for _, p := range gs.Spec.Ports {
if p.PortPolicy == agonesv1.Dynamic || p.PortPolicy == agonesv1.Passthrough {
assert.True(t, 10 <= p.HostPort && p.HostPort <= maxPort, "%v is not between 10 and 20", p)
Expand All @@ -195,11 +196,21 @@ func TestPortAllocatorAllocate(t *testing.T) {
}
}

logrus.WithField("allocated", countTotalAllocatedPorts(pa)).WithField("count", len(pa.portAllocations[0])+len(pa.portAllocations[1])).Info("How many allocated")
assert.Len(t, pa.portAllocations, 3)
gs := pa.Allocate(fixture.DeepCopy())
logrus.WithField("Allocated", countTotalAllocatedPorts(pa)).WithField("Total", countTotalPorts(pa)).Info("Ports count")
assert.Len(t, pa.portAllocations, 2)
// allocate extra 3 ports
gs := pa.Allocate(morePortFixture.DeepCopy())
require.NotNil(t, gs)
assert.NotEmpty(t, gs.Spec.Ports[0].HostPort)
assert.Len(t, pa.portAllocations, 2)
logrus.WithField("Allocated", countTotalAllocatedPorts(pa)).WithField("Total", countTotalPorts(pa)).Info("Ports count")

// allocate extra 3 ports
gs = pa.Allocate(morePortFixture.DeepCopy())
require.NotNil(t, gs)
assert.NotEmpty(t, gs.Spec.Ports[0].HostPort)
assert.Len(t, pa.portAllocations, 4)
assert.Len(t, pa.portAllocations, 3)
logrus.WithField("Allocated", countTotalAllocatedPorts(pa)).WithField("Total", countTotalPorts(pa)).Info("Ports count")
})

t.Run("ports are unique in a node", func(t *testing.T) {
Expand All @@ -213,12 +224,14 @@ func TestPortAllocatorAllocate(t *testing.T) {
})
_, cancel := agtesting.StartInformers(m, pa.nodeSynced)
defer cancel()

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

var ports []int32
for i := 10; i <= 20; i++ {
gs := pa.Allocate(fixture.DeepCopy())
assert.Nil(t, err)
require.NotNil(t, gs)
assert.NotContains(t, ports, gs.Spec.Ports[0].HostPort)
ports = append(ports, gs.Spec.Ports[0].HostPort)
}
Expand All @@ -236,8 +249,10 @@ func TestPortAllocatorMultithreadAllocate(t *testing.T) {
})
_, cancel := agtesting.StartInformers(m, pa.nodeSynced)
defer cancel()

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

wg := sync.WaitGroup{}

// do this for more than the nodes that are pre-allocated, to make sure
Expand All @@ -248,10 +263,10 @@ func TestPortAllocatorMultithreadAllocate(t *testing.T) {
for x := 0; x < 10; x++ {
logrus.WithField("x", x).WithField("i", i).Info("allocating!")
gs := pa.Allocate(fixture.DeepCopy())
require.NotNil(t, gs)
for _, p := range gs.Spec.Ports {
assert.NotEmpty(t, p.HostPort)
}
assert.Nil(t, err)
}
wg.Done()
}(i)
Expand All @@ -274,14 +289,15 @@ func TestPortAllocatorDeAllocate(t *testing.T) {
_, cancel := agtesting.StartInformers(m, pa.nodeSynced)
defer cancel()
err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

// gate
assert.NotEmpty(t, fixture.Spec.Ports)

for i := 0; i <= 100; i++ {
gs := pa.Allocate(fixture.DeepCopy())
assert.Nil(t, err)
require.NotNil(t, gs)

port := gs.Spec.Ports[0]
assert.True(t, 10 <= port.HostPort && port.HostPort <= 20)
assert.Equal(t, 1, countAllocatedPorts(pa, port.HostPort))
Expand Down Expand Up @@ -351,7 +367,7 @@ func TestPortAllocatorSyncPortAllocations(t *testing.T) {
defer cancel()

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

assert.Len(t, pa.portAllocations, 3)
assert.Len(t, pa.gameServerRegistry, 5)
Expand Down Expand Up @@ -413,7 +429,7 @@ func TestPortAllocatorSyncDeleteGameServer(t *testing.T) {
assert.True(t, cache.WaitForCacheSync(stop, pa.gameServerSynced))

err := pa.syncAll()
assert.Nil(t, err)
require.NoError(t, err)

// gate
pa.mutex.RLock() // reading mutable state, so read lock
Expand Down Expand Up @@ -451,7 +467,7 @@ func TestNodePortAllocation(t *testing.T) {
return true, nl, nil
})
result := pa.nodePortAllocation([]*corev1.Node{&n1, &n2, &n3})
assert.Len(t, result, 3)
require.Len(t, result, 3)
for _, n := range nodes {
ports, ok := result[n.ObjectMeta.Name]
assert.True(t, ok, "Should have a port allocation for %s", n.ObjectMeta.Name)
Expand Down Expand Up @@ -547,3 +563,11 @@ func countTotalAllocatedPorts(pa *PortAllocator) int {
}
return count
}

func countTotalPorts(pa *PortAllocator) int {
count := 0
for _, node := range pa.portAllocations {
count += len(node)
}
return count
}