Merge pull request #428 from arangodb/bug-fix/limit-requests-resources

Added test for resource rotation.

pkg/apis/deployment/v1alpha/deployment_spec.go

@@ -162,6 +162,25 @@ func (s DeploymentSpec) GetServerGroupSpec(group ServerGroup) ServerGroupSpec {
 	}
 }
 
+// UpdateServerGroupSpec returns the server group spec (from this
+// deployment spec) for the given group.
+func (s *DeploymentSpec) UpdateServerGroupSpec(group ServerGroup, gspec ServerGroupSpec) {
+	switch group {
+	case ServerGroupSingle:
+		s.Single = gspec
+	case ServerGroupAgents:
+		s.Agents = gspec
+	case ServerGroupDBServers:
+		s.DBServers = gspec
+	case ServerGroupCoordinators:
+		s.Coordinators = gspec
+	case ServerGroupSyncMasters:
+		s.SyncMasters = gspec
+	case ServerGroupSyncWorkers:
+		s.SyncWorkers = gspec
+	}
+}
+
 // SetDefaults fills in default values when a field is not specified.
 func (s *DeploymentSpec) SetDefaults(deploymentName string) {
 	if s.GetMode() == "" {

tests/predicates.go

@@ -25,7 +25,11 @@ package tests
 import (
 	"fmt"
 
+	v1 "k8s.io/api/core/v1"
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 )
 
 // deploymentIsReady creates a predicate that returns nil when the deployment is in
@@ -41,3 +45,44 @@ func deploymentIsReady() func(*api.ArangoDeployment) error {
 		return fmt.Errorf("Expected Ready condition to be set, it is not")
 	}
 }
+
+func resourcesRequireRotation(wanted, given v1.ResourceRequirements) bool {
+	checkList := func(wanted, given v1.ResourceList) bool {
+		for k, v := range wanted {
+			if gv, ok := given[k]; !ok {
+				return true
+			} else if v.Cmp(gv) != 0 {
+				return true
+			}
+		}
+
+		return false
+	}
+
+	return checkList(wanted.Limits, given.Limits) || checkList(wanted.Requests, given.Requests)
+}
+
+func resourcesAsRequested(kubecli kubernetes.Interface, ns string) func(obj *api.ArangoDeployment) error {
+	return func(obj *api.ArangoDeployment) error {
+		return obj.ForeachServerGroup(func(group api.ServerGroup, spec api.ServerGroupSpec, status *api.MemberStatusList) error {
+
+			for _, m := range *status {
+				pod, err := kubecli.CoreV1().Pods(ns).Get(m.PodName, metav1.GetOptions{})
+				if err != nil {
+					return err
+				}
+
+				c, found := k8sutil.GetContainerByName(pod, k8sutil.ServerContainerName)
+				if !found {
+					return fmt.Errorf("Container not found: %s", m.PodName)
+				}
+
+				if resourcesRequireRotation(spec.Resources, c.Resources) {
+					return fmt.Errorf("Container of Pod %s need rotation", m.PodName)
+				}
+			}
+
+			return nil
+		}, nil)
+	}
+}

tests/resources_test.go

@@ -0,0 +1,120 @@
+//
+// DISCLAIMER
+//
+// Copyright 2018 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+// Author Lars Maier
+//
+
+package tests
+
+import (
+	"fmt"
+	"testing"
+
+	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1alpha"
+	"github.com/arangodb/kube-arangodb/pkg/client"
+	kubeArangoClient "github.com/arangodb/kube-arangodb/pkg/client"
+	"github.com/arangodb/kube-arangodb/pkg/util"
+	"github.com/dchest/uniuri"
+	"github.com/stretchr/testify/assert"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+)
+
+func TestResourcesChangeLimitsCluster(t *testing.T) {
+	longOrSkip(t)
+	c := client.MustNewInCluster()
+	kubecli := mustNewKubeClient(t)
+	deploymentClient := kubeArangoClient.MustNewInCluster()
+	ns := getNamespace(t)
+
+	size500m, _ := resource.ParseQuantity("50m")
+	size1, _ := resource.ParseQuantity("1")
+	size100Gi, _ := resource.ParseQuantity("100Gi")
+	size1Gi, _ := resource.ParseQuantity("1Gi")
+	size2Gi, _ := resource.ParseQuantity("2Gi")
+
+	// Prepare deployment config
+	depl := newDeployment("test-chng-limits-" + uniuri.NewLen(4))
+	depl.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
+	depl.Spec.DBServers.Count = util.NewInt(2)
+	depl.Spec.Coordinators.Count = util.NewInt(2)
+	depl.Spec.SetDefaults(depl.GetName()) // this must be last
+	defer deferedCleanupDeployment(c, depl.GetName(), ns)
+
+	// Create deployment
+	_, err := deploymentClient.DatabaseV1alpha().ArangoDeployments(ns).Create(depl)
+	defer removeDeployment(deploymentClient, depl.GetName(), ns)
+	assert.NoError(t, err, "failed to create deplyment: %s", err)
+
+	testGroups := []api.ServerGroup{api.ServerGroupCoordinators, api.ServerGroupAgents, api.ServerGroupDBServers}
+
+	testCases := []v1.ResourceRequirements{
+		{
+			Limits: v1.ResourceList{
+				v1.ResourceCPU: size1,
+			},
+		},
+		{
+			Requests: v1.ResourceList{
+				v1.ResourceCPU: size500m,
+			},
+		},
+		{
+			Requests: v1.ResourceList{
+				v1.ResourceCPU:    size500m,
+				v1.ResourceMemory: size1Gi,
+			},
+		},
+		{
+			Requests: v1.ResourceList{
+				v1.ResourceCPU:    size500m,
+				v1.ResourceMemory: size2Gi,
+			},
+		},
+		{
+			Limits: v1.ResourceList{
+				v1.ResourceCPU:    size1,
+				v1.ResourceMemory: size100Gi,
+			},
+		},
+	}
+
+	for _, testgroup := range testGroups {
+		t.Run(testgroup.AsRole(), func(t *testing.T) {
+
+			_, err = waitUntilDeployment(deploymentClient, depl.GetName(), ns, deploymentIsReady())
+			assert.NoError(t, err, fmt.Sprintf("Deployment not running in time: %s", err))
+
+			for i, testCase := range testCases {
+				t.Run(fmt.Sprintf("case-%d", i+1), func(t *testing.T) {
+					depl, err = updateDeployment(c, depl.GetName(), ns, func(spec *api.DeploymentSpec) {
+						gspec := spec.GetServerGroupSpec(testgroup)
+						gspec.Resources = testCase
+						spec.UpdateServerGroupSpec(testgroup, gspec)
+					})
+					assert.NoError(t, err, fmt.Sprintf("Failed to update deployment: %s", err))
+
+					_, err = waitUntilDeployment(deploymentClient, depl.GetName(), ns, resourcesAsRequested(kubecli, ns))
+					assert.NoError(t, err, fmt.Sprintf("Deployment not rotated in time: %s", err))
+				})
+			}
+		})
+	}
+
+}