Skip to content

fix: simplify poll error handling #117

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
ctrox merged 1 commit into from
Dec 7, 2025
Merged

fix: simplify poll error handling #117

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
25 changes: 11 additions & 14 deletions manager/node/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,20 @@ func (ns *nodeService) Restore(ctx context.Context, req *nodev1.RestoreRequest)
container := v1.MigrationContainer{}
pCtx, cancel := context.WithTimeout(ctx, time.Second*10)
defer cancel()
if err := pollUntilContextCancel(pCtx, func(ctx context.Context) (done bool, perr error) {
if err := pollUntilContextCancel(pCtx, func(ctx context.Context) (bool, error) {
if err := ns.kube.Get(ctx, client.ObjectKeyFromObject(migration), migration); err != nil {
perr = err
return
return false, err
}
for _, ctr := range migration.Spec.Containers {
if ctr.Name == req.PodInfo.ContainerName {
if (migration.Spec.LiveMigration && ctr.PageServer != nil && ctr.ImageServer != nil) ||
ctr.ImageServer != nil {
container = ctr
done = true
return true, nil
}
}
}
return
return false, nil
}); err != nil {
ns.setMigrationFailed(ctx, req.PodInfo.ContainerName, migration)
log.Error("migration servers unset", "container_name", req.PodInfo.ContainerName)
Expand Down Expand Up @@ -518,19 +517,18 @@ func (ns *nodeService) PrepareEvac(ctx context.Context, req *nodev1.EvacRequest)
// wait for the migration to be claimed
pCtx, cancel := context.WithTimeout(ctx, migrationClaimTimeout)
defer cancel()
if err := pollUntilContextCancel(pCtx, func(ctx context.Context) (done bool, perr error) {
if err := pollUntilContextCancel(pCtx, func(ctx context.Context) (bool, error) {
if err := ns.kube.Get(ctx, client.ObjectKeyFromObject(migration), migration); err != nil {
if kerrors.IsNotFound(err) {
return
return false, nil
}
perr = err
return
return false, err
}
if migration.Claimed() {
log.Info("migration is claimed for evac")
done = true
return true, nil
}
return
return false, nil
}); err != nil {
log.Error("prepare evac request failed", "name", migration.Name, "error", err)
if err := ns.updateMigrationStatus(ctx, client.ObjectKeyFromObject(migration), func(m *v1.Migration) (bool, error) {
Expand All @@ -547,10 +545,9 @@ func (ns *nodeService) PrepareEvac(ctx context.Context, req *nodev1.EvacRequest)
log.Info("waiting for migration restore to be ready")
readyCtx, cancel := context.WithTimeout(ctx, migrationReadyTimeout)
defer cancel()
if err := pollUntilContextCancel(readyCtx, func(ctx context.Context) (done bool, perr error) {
if err := pollUntilContextCancel(readyCtx, func(ctx context.Context) (bool, error) {
if err := ns.kube.Get(ctx, client.ObjectKeyFromObject(migration), migration); err != nil {
perr = err
return
return false, err
}
return migration.Spec.RestoreReady, nil
}); err != nil {
Expand Down