Skip to content

[Feature] Increate member wait timeout #566

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 3 commits into from
May 18, 2020
Merged

[Feature] Increate member wait timeout #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d92a2
Increate member wait timeout
ajanikow May 18, 2020
27b4687
Fix changelog
ajanikow May 18, 2020
1d0d87d
Merge branch 'master' into feature/increase_member_wait_timeout
ajanikow May 18, 2020
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
2 changes: 1 addition & 1 deletion pkg/deployment/reconcile/timeouts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
backupRestoreTimeout = time.Minute * 15
shutdownMemberTimeout = time.Minute * 30
upgradeMemberTimeout = time.Hour * 6
waitForMemberUpTimeout = time.Minute * 15
waitForMemberUpTimeout = time.Minute * 30
tlsSNIUpdateTimeout = time.Minute * 10

shutdownTimeout = time.Second * 15
Expand Down
11 changes: 11 additions & 0 deletions pkg/deployment/resources/pvc_inspector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ func (r *Resources) InspectPVCs(ctx context.Context) (util.Interval, error) {
memberStatus, group, found := status.Members.MemberStatusByPVCName(p.GetName())
if !found {
log.Debug().Str("pvc", p.GetName()).Msg("no memberstatus found for PVC")
if k8sutil.IsPersistentVolumeClaimMarkedForDeletion(&p) && len(p.GetFinalizers()) > 0 {
// Strange, pvc belongs to us, but we have no member for it.
// Remove all finalizers, so it can be removed.
log.Warn().Msg("PVC belongs to this deployment, but we don't know the member. Removing all finalizers")
kubecli := r.context.GetKubeCli()
ignoreNotFound := false
if err := k8sutil.RemovePVCFinalizers(log, kubecli, &p, p.GetFinalizers(), ignoreNotFound); err != nil {
log.Debug().Err(err).Msg("Failed to update PVC (to remove all finalizers)")
return 0, maskAny(err)
}
}
continue
}

Expand Down