Skip to content

fix: reverse deletion order in rollbackDeploying to prevent timeout #2107

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

Closed
clyang82 wants to merge 1 commit into from
Closed

fix: reverse deletion order in rollbackDeploying to prevent timeout #2107

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
17 changes: 9 additions & 8 deletions agent/pkg/spec/migration/migration_to_syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,19 +799,20 @@ func (s *MigrationTargetSyncer) rollbackInitializing(ctx context.Context, spec *
func (s *MigrationTargetSyncer) rollbackDeploying(ctx context.Context, spec *migration.MigrationTargetBundle) error {
log.Infof("rollback deploying stage for clusters: %v", spec.ManagedClusters)

// 1. Remove ManagedClusters from target hub
// 1. Remove KlusterletAddonConfigs from target hub first
// This must happen before removing ManagedClusters to avoid namespace deletion conflicts
for _, clusterName := range spec.ManagedClusters {
if err := s.removeManagedCluster(ctx, clusterName); err != nil {
log.Errorf("failed to remove managed cluster %s: %v", clusterName, err)
return fmt.Errorf("failed to remove managed cluster %s: %v", clusterName, err)
if err := s.removeKlusterletAddonConfig(ctx, clusterName); err != nil {
log.Errorf("failed to remove klusterlet addon config %s: %v", clusterName, err)
return fmt.Errorf("failed to remove klusterlet addon config %s: %v", clusterName, err)
}
}

// 2. Remove KlusterletAddonConfigs from target hub
// 2. Remove ManagedClusters from target hub
for _, clusterName := range spec.ManagedClusters {
if err := s.removeKlusterletAddonConfig(ctx, clusterName); err != nil {
log.Errorf("failed to remove klusterlet addon config %s: %v", clusterName, err)
return fmt.Errorf("failed to remove klusterlet addon config %s: %v", clusterName, err)
if err := s.removeManagedCluster(ctx, clusterName); err != nil {
log.Errorf("failed to remove managed cluster %s: %v", clusterName, err)
return fmt.Errorf("failed to remove managed cluster %s: %v", clusterName, err)
}
}

Expand Down