Skip to content

Commit

Permalink
controller: reverse sort when restarting statefulset (#9)
Browse files Browse the repository at this point in the history
Instead of restarting:
regionserver-0, regionserver-1, regionserver-2

Sort:
regionserver-2, regionserver-1, regionserver-0

This better mimics statefulset rolling restart:
https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#rolling-update
  • Loading branch information
pidren authored May 10, 2021
1 parent 95fa50f commit d7bc353
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 4 deletions.
18 changes: 14 additions & 4 deletions controllers/hbase_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"hash"
"sort"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -476,6 +477,18 @@ func sprintPodList(l []*corev1.Pod) string {
return fmt.Sprintf("%v", podNames)
}

func orderPodListByName(pl *corev1.PodList) {
// sort in reverse ordinal order to best simulate how statefulset controller
// updates pods in a statefulset
// https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#rolling-update
// sts pods are in format <sts name>-N
sort.Slice(pl.Items, func(i, j int) bool {
arg1, _ := strconv.Atoi(strings.Split(pl.Items[i].Name, "-")[1])
arg2, _ := strconv.Atoi(strings.Split(pl.Items[j].Name, "-")[1])
return arg1 > arg2
})
}

func (r *HBaseReconciler) ensureStatefulSetPods(ctx context.Context, sts *appsv1.StatefulSet,
pickToDelete func(ctx context.Context, td, utd []*corev1.Pod) (*corev1.Pod, error)) (bool, error) {
podList := &corev1.PodList{}
Expand All @@ -489,10 +502,7 @@ func (r *HBaseReconciler) ensureStatefulSetPods(ctx context.Context, sts *appsv1

r.Log.Info("matched pods", "statefulset", sts.Name, "pods", len(podList.Items))

// sort pods by name to have things restarted predictably
sort.Slice(podList.Items, func(i, j int) bool {
return podList.Items[i].Name < podList.Items[j].Name
})
orderPodListByName(podList)

// make sure that all pods are up by checking that all containers are ready.
// the loop exists if any pod is not ready.
Expand Down
94 changes: 94 additions & 0 deletions controllers/hbase_controller_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
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.
*/

package controllers

import (
"testing"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func TestOrderPodList(t *testing.T) {
createPodListByName := func(names []string) *corev1.PodList {
pl := &corev1.PodList{}
for _, name := range names {
pl.Items = append(pl.Items, corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
})
}
return pl
}

tests := []struct {
given *corev1.PodList
expect *corev1.PodList
}{
// Empty list
{
given: createPodListByName([]string{}),
expect: createPodListByName([]string{}),
},
// Single pod list
{
given: createPodListByName([]string{"regionserver-0"}),
expect: createPodListByName([]string{"regionserver-0"}),
},
// Two pods
// (We don't test for two pods with the same name since that would normally
// never exist within a statefulset podlist)
{
given: createPodListByName([]string{"regionserver-0", "regionserver-1"}),
expect: createPodListByName([]string{"regionserver-1", "regionserver-0"}),
},
// Multiple pods
{
given: createPodListByName([]string{"regionserver-1", "regionserver-10", "regionserver-11"}),
expect: createPodListByName([]string{"regionserver-11", "regionserver-10", "regionserver-1"}),
},
// Multiple pods
{
given: createPodListByName([]string{"regionserver-0", "regionserver-1", "regionserver-2", "regionserver-3", "regionserver-9", "regionserver-10", "regionserver-11", "regionserver-12"}),
expect: createPodListByName([]string{"regionserver-12", "regionserver-11", "regionserver-10", "regionserver-9", "regionserver-3", "regionserver-2", "regionserver-1", "regionserver-0"}),
},
}

equalPodListByName := func(pl1 *corev1.PodList, pl2 *corev1.PodList) bool {
if (pl1.Items == nil) == (pl2.Items == nil) {
return true
}

if len(pl1.Items) != len(pl2.Items) {
return false
}
for i, _ := range pl1.Items {
if pl1.Items[i].Name != pl2.Items[i].Name {
return false
}
}
return true
}

for _, test := range tests {
orderPodListByName(test.given)
if !equalPodListByName(test.given, test.expect) {
t.Error()
}
}
}

0 comments on commit d7bc353

Please sign in to comment.