WRKLDS-593 - reordering the stack unwinding to fix how we execute the backup collection #1273
Conversation
| if !runBackCollection { | ||
| return | ||
| } | ||
| o.BackupGathering(context.TODO(), errs) |
There was a problem hiding this comment.
Shifting this after the getNamespace call means that failing getNamespace() call will bail out of Run without performing BackupGathering. But we want BackupGathering even when we cannot create namespaces. Something like this could cover both:
var ns *corev1.Namespace
var cleanupNamespace func()
// ... ensure resource cleanup unless instructed otherwise ...
if !o.Keep {
defer func() {
if cleanupNamespace != nil {
cleanupNamespace()
}
}()
}
// Due to 'stack unwiding', this should happen after 'clusterState' printing, to ensure that we always
// print our ClusterState information.
runBackCollection := true
defer func() {
if runBackCollection {
o.BackupGathering(context.TODO(), errs, ns) // FIXME: also updating BackupGathering to take a possibly-nil *corev1.Namespace, which gets namespace gathering if it's not nil.
}
}()
// Get or create "working" namespace ...
var err error
ns, cleanupNamespace, err = o.getNamespace()
...Then we'd have a flow tree like:
- Namespace creation fails
- Pop the deferred gather. Gathers the default stuff, but no temporary namespace.
- Pop the deferred namespace removal. Nothing to remove.
- Namespace creation succeeds
- The main gather still fails, so
runBackCollectionis stilltrue.- Pop the deferred gather. Gathers the default stuff and also (new with this PR) the temporary namespace.
- Pop the deferred namespace removal. Removes the temporary namespace.
- The main gather succeeds, so runBackCollection
isfalse`.- Pop the deferred gather.
runBackCollectionisfalse, so it's a no-op. - Pop the deferred namespace removal. Removes the temporary namespace.
- Pop the deferred gather.
- The main gather still fails, so
There was a problem hiding this comment.
With respect to ordering, I agree with @wking.
We can still run backing up even if the getNamespace fails and the proposed code snippet above ^ sounds reasonable to me.
However, backing up also must-gather temporary namespace might be handled in separate PR under the light of elaborated decision tree above.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sferich888, soltysh The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/test e2e-agnostic-cmd |
|
/retest |
|
@sferich888: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
Issues go stale after 90d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle stale |
openshift-ci
bot
added
the
lifecycle/stale
openshift-merge-robot
added
the
needs-rebase
|
PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
Stale issues rot after 30d of inactivity. Mark the issue as fresh by commenting If this issue is safe to close now please do so with /lifecycle rotten |
openshift-ci
bot
added
lifecycle/rotten
|
Rotten issues close after 30d of inactivity. Reopen the issue by commenting /close |
|
@openshift-bot: Closed this PR. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
No description provided.