diff --git a/Gopkg.lock b/Gopkg.lock index f09c843ac..593c0257f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1317,7 +1317,6 @@ "k8s.io/client-go/informers/apps/v1", "k8s.io/client-go/informers/core/v1", "k8s.io/client-go/informers/internalinterfaces", - "k8s.io/client-go/informers/rbac/v1", "k8s.io/client-go/kubernetes", "k8s.io/client-go/kubernetes/fake", "k8s.io/client-go/kubernetes/scheme", diff --git a/pkg/operator/cassandra/controller/cluster_test.go b/pkg/operator/cassandra/controller/cluster_test.go index 0803b0194..ab5cdfa17 100644 --- a/pkg/operator/cassandra/controller/cluster_test.go +++ b/pkg/operator/cassandra/controller/cluster_test.go @@ -17,9 +17,12 @@ limitations under the License. package controller import ( + "fmt" cassandrav1alpha1 "github.com/rook/rook/pkg/apis/cassandra.rook.io/v1alpha1" + "github.com/rook/rook/pkg/operator/cassandra/constants" "github.com/rook/rook/pkg/operator/cassandra/controller/util" - "github.com/rook/rook/pkg/operator/cassandra/test" + casstest "github.com/rook/rook/pkg/operator/cassandra/test" + "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -28,7 +31,7 @@ import ( func TestCreateRack(t *testing.T) { - simpleCluster := test.NewSimpleCluster(3) + simpleCluster := casstest.NewSimpleCluster(3) tests := []struct { name string @@ -105,7 +108,7 @@ func TestScaleUpRack(t *testing.T) { currMembers := int32(2) expMembers := int32(3) - c := test.NewSimpleCluster(expMembers) + c := casstest.NewSimpleCluster(expMembers) r := c.Spec.Datacenter.Racks[0] sts := util.StatefulSetForRack(r, c, "") *sts.Spec.Replicas = currMembers @@ -175,3 +178,73 @@ func TestScaleUpRack(t *testing.T) { }) } } + +func TestScaleDownRack(t *testing.T) { + + desired := int32(2) + actual := int32(3) + + c := casstest.NewSimpleCluster(desired) + r := c.Spec.Datacenter.Racks[0] + c.Status = cassandrav1alpha1.ClusterStatus{ + Racks: map[string]*cassandrav1alpha1.RackStatus{ + r.Name: { + Members: actual, + ReadyMembers: actual, + }, + }, + } + sts := util.StatefulSetForRack(r, c, "") + memberServices := casstest.MemberServicesForCluster(c) + + // Find the member to decommission + memberName := fmt.Sprintf("%s-%d", util.StatefulSetNameForRack(r, c), actual-1) + + t.Run("scale down requested and started", func(t *testing.T) { + + kubeObjects := append(memberServices, sts) + rookObjects := []runtime.Object{c} + cc := newFakeClusterController(kubeObjects, rookObjects) + + err := cc.scaleDownRack(r, c) + require.NoErrorf(t, err, "Unexpected error while scaling down: %v", err) + + // Check that MemberService has the decomissioned label + svc, err := cc.serviceLister.Services(c.Namespace).Get(memberName) + require.NoErrorf(t, err, "Unexpected error while getting MemberService: %v", err) + + val, ok := svc.Labels[constants.DecommissionLabel] + require.True(t, ok, "Service didn't have the decommissioned label as expected") + require.Truef(t, val == constants.LabelValueFalse, "Decomissioned Label had unexpected value: %s", val) + + }) + + t.Run("scale down resumed", func(t *testing.T) { + + sts.Spec.Replicas = &actual + + kubeObjects := append(memberServices, sts) + rookObjects := []runtime.Object{c} + + cc := newFakeClusterController(kubeObjects, rookObjects) + + svc, err := cc.serviceLister.Services(c.Namespace).Get(memberName) + require.NoErrorf(t, err, "Unexpected error while getting MemberService: %v", err) + + // Mark as decommissioned + svc.Labels[constants.DecommissionLabel] = constants.LabelValueTrue + _, err = cc.kubeClient.CoreV1().Services(svc.Namespace).Update(svc) + require.Nilf(t, err, "Unexpected error while updating MemberService: %v", err) + + // Resume decommission + err = cc.scaleDownRack(r, c) + require.NoErrorf(t, err, "Unexpected error while resuming scale down: %v", err) + + // Check that StatefulSet is scaled + updatedSts, err := cc.kubeClient.AppsV1().StatefulSets(sts.Namespace).Get(sts.Name, metav1.GetOptions{}) + require.NoErrorf(t, err, "Unexpected error while getting statefulset: %v", err) + require.Truef(t, *updatedSts.Spec.Replicas == *sts.Spec.Replicas-1, "Statefulset has incorrect number of replicas. Expected: %d, got %d.", *sts.Spec.Replicas-1, *updatedSts.Spec.Replicas) + + }) + +} diff --git a/pkg/operator/cassandra/controller/controller_test.go b/pkg/operator/cassandra/controller/controller_test.go index ba0088391..ad287b4e4 100644 --- a/pkg/operator/cassandra/controller/controller_test.go +++ b/pkg/operator/cassandra/controller/controller_test.go @@ -31,7 +31,7 @@ import ( "time" ) -const informerResyncPeriod = time.Millisecond * 300 +const informerResyncPeriod = time.Millisecond // newFakeClusterController returns a ClusterController with fake clientsets // and informers. diff --git a/pkg/operator/cassandra/test/test.go b/pkg/operator/cassandra/test/test.go index 6ea8334a1..a510fa9b2 100644 --- a/pkg/operator/cassandra/test/test.go +++ b/pkg/operator/cassandra/test/test.go @@ -17,8 +17,12 @@ limitations under the License. package test import ( + "fmt" cassandrav1alpha1 "github.com/rook/rook/pkg/apis/cassandra.rook.io/v1alpha1" + "github.com/rook/rook/pkg/operator/cassandra/controller/util" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" ) func NewSimpleCluster(members int32) *cassandrav1alpha1.Cluster { @@ -46,3 +50,22 @@ func NewSimpleCluster(members int32) *cassandrav1alpha1.Cluster { }, } } + +// MemberServicesForCluster returns the member services for a given cluster +func MemberServicesForCluster(c *cassandrav1alpha1.Cluster) []runtime.Object { + + services := []runtime.Object{} + for _, r := range c.Spec.Datacenter.Racks { + for i := int32(0); i < c.Status.Racks[r.Name].Members; i++ { + svc := &corev1.Service{ + ObjectMeta: metav1.ObjectMeta{ + Name: fmt.Sprintf("%s-%s-%s-%d", c.Name, c.Spec.Datacenter.Name, r.Name, i), + Namespace: c.Namespace, + Labels: util.RackLabels(r, c), + }, + } + services = append(services, svc) + } + } + return services +}