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

Fixing a bug in updating status after on-demand operation. #301

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Fixing a bug in updating status after on-demand operation. #301

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
8 changes: 4 additions & 4 deletions controllers/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,13 +1537,13 @@ func (r *SingleClusterReconciler) updateOperationStatus(restartedASDPodNames, re
statusPods := sets.New(statusOp.PodList...)

if statusOp.Kind == asdbv1.OperationWarmRestart {
if quickRestartsSet != nil {
if quickRestartsSet.Len() > 0 {
statusOp.PodList = statusPods.Union(quickRestartsSet.Intersection(specPods)).UnsortedList()
}

// If the operation is a warm restart and the pod undergoes a cold restart for any reason,
// we will still consider the warm restart operation as completed for that pod.
if podRestartsSet != nil {
if podRestartsSet.Len() > 0 {
statusOp.PodList = statusPods.Union(podRestartsSet.Intersection(specPods)).UnsortedList()
}
}
Expand All @@ -1561,13 +1561,13 @@ func (r *SingleClusterReconciler) updateOperationStatus(restartedASDPodNames, re
var podList []string

if specOp.Kind == asdbv1.OperationWarmRestart {
if quickRestartsSet != nil {
if quickRestartsSet.Len() > 0 {
podList = quickRestartsSet.Intersection(specPods).UnsortedList()
}

// If the operation is a warm restart and the pod undergoes a cold restart for any reason,
// we will still consider the warm restart operation as completed for that pod.
if podRestartsSet != nil {
if podRestartsSet.Len() > 0 {
podList = append(podList, podRestartsSet.Intersection(specPods).UnsortedList()...)
}
}
Expand Down
8 changes: 4 additions & 4 deletions controllers/rack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ func (r *SingleClusterReconciler) reconcileRacks() reconcileResult {
// remove ignorable pods from failedPods
failedPods = getNonIgnorablePods(failedPods, ignorablePodNames)
if len(failedPods) != 0 {
r.Log.Info("Reconcile the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", failedPods)
r.Log.Info("Reconcile the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", getPodNames(failedPods))

if res = r.reconcileRack(
found, state, ignorablePodNames, failedPods,
); !res.isSuccess {
return res
}

r.Log.Info("Reconciled the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", failedPods)
r.Log.Info("Reconciled the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", getPodNames(failedPods))
}

// 2. Again, fetch the pods for the rack and if there are failed pods then restart them.
Expand All @@ -114,14 +114,14 @@ func (r *SingleClusterReconciler) reconcileRacks() reconcileResult {
// remove ignorable pods from failedPods
failedPods = getNonIgnorablePods(failedPods, ignorablePodNames)
if len(failedPods) != 0 {
r.Log.Info("Restart the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", failedPods)
r.Log.Info("Restart the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", getPodNames(failedPods))

if _, res = r.rollingRestartRack(found, state, ignorablePodNames, nil,
failedPods); !res.isSuccess {
return res
}

r.Log.Info("Restarted the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", failedPods)
r.Log.Info("Restarted the failed pods in the Rack", "rackID", state.Rack.ID, "failedPods", getPodNames(failedPods))
// Requeue after 1 second to fetch latest CR object with updated pod status
return reconcileRequeueAfter(1)
}
Expand Down
1 change: 1 addition & 0 deletions test/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ func clusterWithMaxIgnorablePod(ctx goctx.Context) {
err = k8sClient.Update(ctx, pod)
Expect(err).ToNot(HaveOccurred())

// Underlying kubernetes cluster should have atleast 6 nodes to run this test successfully.
By("Delete rack with id 2")
aeroCluster, err = getCluster(k8sClient, ctx, clusterNamespacedName)
Expect(err).ToNot(HaveOccurred())
Expand Down
Loading