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

bugfix (CollaSet): correctly check Pod update finished #43

Merged
merged 1 commit into from
Aug 21, 2023
Merged

bugfix (CollaSet): correctly check Pod update finished #43

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
6 changes: 3 additions & 3 deletions pkg/controllers/collaset/synccontrol/sync_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,11 +460,11 @@ func (sc *RealSyncControl) Update(set *appsv1alpha1.CollaSet, podWrapers []*coll
}

// try to finish all Pods'PodOpsLifecycle if its update is finished.
succCount, err = controllerutils.SlowStartBatch(len(podWrapers), controllerutils.SlowStartInitialBatchSize, false, func(i int, _ error) error {
podInfo := podWrapers[i]
succCount, err = controllerutils.SlowStartBatch(len(podUpdateInfos), controllerutils.SlowStartInitialBatchSize, false, func(i int, _ error) error {
podInfo := podUpdateInfos[i]

// check Pod update is finished or not
finished, msg, err := updater.GetPodUpdateFinishStatus(podInfo.Pod)
finished, msg, err := updater.GetPodUpdateFinishStatus(podInfo)
if err != nil {
return fmt.Errorf("fail to get pod %s/%s update finished: %s", podInfo.Namespace, podInfo.Name, err)
}
Expand Down
28 changes: 16 additions & 12 deletions pkg/controllers/collaset/synccontrol/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func (o orderByDefault) Less(i, j int) bool {

type PodUpdater interface {
AnalyseAndGetUpdatedPod(cls *appsv1alpha1.CollaSet, revision *appsv1.ControllerRevision, podUpdateInfo *PodUpdateInfo) (inPlaceUpdateSupport bool, onlyMetadataChanged bool, updatedPod *corev1.Pod, err error)
GetPodUpdateFinishStatus(pod *corev1.Pod) (bool, string, error)
GetPodUpdateFinishStatus(podUpdateInfo *PodUpdateInfo) (bool, string, error)
}

func newPodUpdater(cls *appsv1alpha1.CollaSet) PodUpdater {
Expand Down Expand Up @@ -263,25 +263,29 @@ func (u *InPlaceIfPossibleUpdater) diffPod(currentPod, updatedPod *corev1.Pod) (
return true, false
}

func (u *InPlaceIfPossibleUpdater) GetPodUpdateFinishStatus(pod *corev1.Pod) (finished bool, msg string, err error) {
if pod.Status.ContainerStatuses == nil {
func (u *InPlaceIfPossibleUpdater) GetPodUpdateFinishStatus(podUpdateInfo *PodUpdateInfo) (finished bool, msg string, err error) {
if !podUpdateInfo.IsUpdatedRevision {
return false, "not updated revision", nil
}

if podUpdateInfo.Status.ContainerStatuses == nil {
return false, "no container status", nil
}

if pod.Spec.Containers == nil {
if podUpdateInfo.Spec.Containers == nil {
return false, "no container spec", nil
}

if len(pod.Spec.Containers) != len(pod.Status.ContainerStatuses) {
if len(podUpdateInfo.Spec.Containers) != len(podUpdateInfo.Status.ContainerStatuses) {
return false, "container status number does not match", nil
}

if pod.Annotations == nil {
if podUpdateInfo.Annotations == nil {
return true, "no annotations for last container status", nil
}

podLastState := &PodStatus{}
if lastStateJson, exist := pod.Annotations[appsv1alpha1.LastPodStatusAnnotationKey]; !exist {
if lastStateJson, exist := podUpdateInfo.Annotations[appsv1alpha1.LastPodStatusAnnotationKey]; !exist {
return true, "no pod last state annotation", nil
} else if err := json.Unmarshal([]byte(lastStateJson), podLastState); err != nil {
msg := fmt.Sprintf("malformat pod last state annotation [%s]: %s", lastStateJson, err)
Expand All @@ -293,12 +297,12 @@ func (u *InPlaceIfPossibleUpdater) GetPodUpdateFinishStatus(pod *corev1.Pod) (fi
}

imageMapping := map[string]string{}
for _, containerSpec := range pod.Spec.Containers {
for _, containerSpec := range podUpdateInfo.Spec.Containers {
imageMapping[containerSpec.Name] = containerSpec.Image
}

imageIdMapping := map[string]string{}
for _, containerStatus := range pod.Status.ContainerStatuses {
for _, containerStatus := range podUpdateInfo.Status.ContainerStatuses {
imageIdMapping[containerStatus.Name] = containerStatus.ImageID
}

Expand Down Expand Up @@ -335,7 +339,7 @@ func (u *InPlaceOnlyPodUpdater) AnalyseAndGetUpdatedPod(_ *appsv1alpha1.CollaSet
return
}

func (u *InPlaceOnlyPodUpdater) GetPodUpdateFinishStatus(_ *corev1.Pod) (finished bool, msg string, err error) {
func (u *InPlaceOnlyPodUpdater) GetPodUpdateFinishStatus(_ *PodUpdateInfo) (finished bool, msg string, err error) {
return
}

Expand All @@ -346,7 +350,7 @@ func (u *RecreatePodUpdater) AnalyseAndGetUpdatedPod(_ *appsv1alpha1.CollaSet, _
return false, false, nil, nil
}

func (u *RecreatePodUpdater) GetPodUpdateFinishStatus(_ *corev1.Pod) (finished bool, msg string, err error) {
func (u *RecreatePodUpdater) GetPodUpdateFinishStatus(podUpdateInfo *PodUpdateInfo) (finished bool, msg string, err error) {
// Recreate policy alway treat Pod as update finished
return true, "", nil
return podUpdateInfo.IsUpdatedRevision, "", nil
}
Loading