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

[controller] Fix bug in TestHandleUpdateClusterCreatesStatefulSets #235

Merged
merged 1 commit into from
Sep 25, 2020
Merged

[controller] Fix bug in TestHandleUpdateClusterCreatesStatefulSets #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,6 @@ k8s.io/apiextensions-apiserver v0.17.2 h1:cP579D2hSZNuO/rZj9XFRzwJNYb41DbNANJb6K
k8s.io/apiextensions-apiserver v0.17.2/go.mod h1:4KdMpjkEjjDI2pPfBA15OscyNldHWdBCfsWMDWAmSTs=
k8s.io/apimachinery v0.17.2 h1:hwDQQFbdRlpnnsR64Asdi55GyCaIP/3WQpMmbNBeWr4=
k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
k8s.io/apimachinery v0.18.5 h1:Lh6tgsM9FMkC12K5T5QjRm7rDs6aQN5JHkA0JomULDM=
k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo=
k8s.io/client-go v0.17.2 h1:ndIfkfXEGrNhLIgkr0+qhRguSD3u6DCmonepn1O6NYc=
k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI=
Expand Down
8 changes: 8 additions & 0 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,14 @@ func (c *M3DBController) handleClusterUpdate(cluster *myspec.M3DBCluster) error

_, err = c.kubeClient.AppsV1().StatefulSets(cluster.Namespace).Create(sts)
if err != nil {
if kerrors.IsAlreadyExists(err) {
// There may be a delay between when a StatefulSet is created and when it is
// returned in calls to List because of the caching that the k8s client does.
// So if we receive an error because the StatefulSet already exists that's not
// indicative of a real problem.
c.logger.Info("statefulset already exists", zap.String("name", name))
return nil
}
c.logger.Error(err.Error())
return err
}
Expand Down
15 changes: 8 additions & 7 deletions pkg/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,22 +529,23 @@ func TestHandleUpdateClusterCreatesStatefulSets(t *testing.T) {

// Keep running cluster updates until no more stateful sets required
var expectedMu sync.Mutex
expectedSetsCreated := make(map[string]bool)
for _, name := range test.expCreateStatefulSets {
expectedSetsCreated[name] = false
}
expectedSetsCreated := make(map[string]struct{})

c.kubeClient.(*kubefake.Clientset).PrependReactor("create", "statefulsets", func(action ktesting.Action) (bool, runtime.Object, error) {
cluster := action.(kubetesting.CreateActionImpl).GetObject().(*appsv1.StatefulSet)
name := cluster.Name
expectedMu.Lock()
expectedSetsCreated[name] = true
expectedSetsCreated[name] = struct{}{}
expectedMu.Unlock()
return true, cluster, nil
// Return false to indicate that the next reactor in the chain should process this
// object as well.
return false, nil, nil
})

// Iterate through the expected stateful sets twice to make sure we see all stateful
// sets that we expect and also be able to catch any extra stateful sets that we don't.
var done bool
for i := 0; i < 5; i++ {
for i := 0; i < 2*len(test.expCreateStatefulSets); i++ {
err := c.handleClusterUpdate(cluster)
require.NoError(t, err)

Expand Down