Skip to content

Issue 213: Upgrade of bookkeeper fails intermittently #214

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

Merged
merged 2 commits into from
Jul 19, 2022
Merged

Issue 213: Upgrade of bookkeeper fails intermittently #214

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
9c39001
Issue 213: Upgrade of bookkeeper fails intermittently
anishakj Jul 18, 2022
9d2e72c
Fixing unit test failures
anishakj Jul 18, 2022
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
11 changes: 6 additions & 5 deletions controllers/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,14 @@ func (r *BookkeeperClusterReconciler) syncBookkeeperVersion(bk *bookkeeperv1alph
log.Printf("statefulset (%s) status: %d updated, %d ready, %d target", sts.Name,
sts.Status.UpdatedReplicas, sts.Status.ReadyReplicas, sts.Status.Replicas)

pods, err := r.getStsPodsWithVersion(sts, bk.Status.TargetVersion)
if err != nil {
return false, err
}
// Check whether the upgrade is in progress or has completed
if sts.Status.UpdatedReplicas == sts.Status.Replicas &&
sts.Status.UpdatedReplicas == sts.Status.ReadyReplicas {
sts.Status.UpdatedReplicas == sts.Status.ReadyReplicas &&
*sts.Spec.Replicas == (int32)(len(pods)) {
// StatefulSet upgrade completed
return true, nil
}
Expand All @@ -262,10 +267,6 @@ func (r *BookkeeperClusterReconciler) syncBookkeeperVersion(bk *bookkeeperv1alph
}

// If all replicas are ready, upgrade an old pod
pods, err := r.getStsPodsWithVersion(sts, bk.Status.TargetVersion)
if err != nil {
return false, err
}
ready, err := r.checkUpdatedPods(pods, bk.Status.TargetVersion)
if err != nil {
// Abort if there is any errors with the updated pods
Expand Down
26 changes: 24 additions & 2 deletions controllers/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,14 @@ var _ = Describe("Bookkeeper Cluster Version Sync", func() {
foundBookeeper.Status.Init()
foundBookeeper.Status.SetUpgradingConditionTrue(" ", " ")
r.Client.Update(context.TODO(), foundBookeeper)
sts := &appsv1.StatefulSet{}
name := util.StatefulSetNameForBookie(foundBookeeper.Name)
_ = r.Client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: foundBookeeper.Namespace}, sts)
sts.Status.UpdatedReplicas = sts.Status.Replicas - 1
*sts.Spec.Replicas = 0
sts.Status.Replicas = sts.Status.UpdatedReplicas
sts.Status.ReadyReplicas = sts.Status.UpdatedReplicas
r.Client.Update(context.TODO(), sts)
err = r.syncClusterVersion(foundBookeeper)
})
It("Error should be nil", func() {
Expand Down Expand Up @@ -216,7 +224,15 @@ var _ = Describe("Bookkeeper Cluster Version Sync", func() {
foundBookeeper.Status.Init()
foundBookeeper.Status.UpdateProgress("UpgradeErrorReason", "")
r.Client.Update(context.TODO(), foundBookeeper)
sts := &appsv1.StatefulSet{}
name := util.StatefulSetNameForBookie(foundBookeeper.Name)
_ = r.Client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: foundBookeeper.Namespace}, sts)
*sts.Spec.Replicas = 0
sts.Status.Replicas = sts.Status.UpdatedReplicas
sts.Status.ReadyReplicas = sts.Status.UpdatedReplicas
r.Client.Update(context.TODO(), sts)
err = r.rollbackClusterVersion(foundBookeeper, "0.6.1")

})
It("Error should be nil", func() {
Ω(err).Should(BeNil())
Expand Down Expand Up @@ -331,9 +347,15 @@ var _ = Describe("Bookkeeper Cluster Version Sync", func() {
b2, err1 = r.syncBookkeeperVersion(foundBookeeper)
foundBookeeper.Status.TargetVersion = foundBookeeper.Spec.Version
r.Client.Update(context.TODO(), foundBookeeper)
b3, err2 = r.syncBookkeeperVersion(foundBookeeper)
sts = &appsv1.StatefulSet{}
name := util.StatefulSetNameForBookie(foundBookeeper.Name)
sts = &appsv1.StatefulSet{}
_ = r.Client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: foundBookeeper.Namespace}, sts)
*sts.Spec.Replicas = 0
sts.Status.Replicas = sts.Status.UpdatedReplicas
sts.Status.ReadyReplicas = sts.Status.UpdatedReplicas
r.Client.Update(context.TODO(), sts)
b3, err2 = r.syncBookkeeperVersion(foundBookeeper)
name = util.StatefulSetNameForBookie(foundBookeeper.Name)
_ = r.Client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: foundBookeeper.Namespace}, sts)
sts.Status.UpdatedReplicas = sts.Status.Replicas - 1
r.Client.Update(context.TODO(), sts)
Expand Down