Check the PVB status via podvolume Backupper rather than calling API server to avoid API server issue #8596
+200
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release-1.15 #8596 +/- ##
=============================================
Coverage 59.10% 59.10%
=============================================
Files 367 367
Lines 39141 39178 +37
=============================================
+ Hits 23134 23156 +22
- Misses 14535 14542 +7
- Partials 1472 1480 +8 ☔ View full report in Codecov by Sentry. |
ywk253100
force-pushed
the
20250109_pvb
branch
from
033716f to
b12df50
Compare
Lyndon-Li
previously approved these changes
Jan 10, 2025
blackpiglet
previously approved these changes
Jan 10, 2025
reasonerjt
reviewed
Jan 10, 2025
pkg/backup/backup.go
Outdated
| pvb.Status.Phase == velerov1api.PodVolumeBackupPhaseFailed { | ||
| processed = true | ||
| } | ||
| pvbMap[pvb] = processed |
There was a problem hiding this comment.
trivial, but the variable processed is not needed:
pvbMap[pvb] = pvb.Status.Phase == velerov1api.PodVolumeBackupPhaseCompleted ||
pvb.Status.Phase == velerov1api.PodVolumeBackupPhaseFailed
pkg/podvolume/backupper.go
Outdated
| @@ -312,6 +336,12 @@ func (b *backupper) BackupPodVolumes(backup *velerov1api.Backup, pod *corev1api. | |||
| continue | |||
| } | |||
| b.wg.Add(1) | |||
|
|
|||
| if err := b.pvbIndexer.Add(volumeBackup); err != nil { | |||
| errs = append(errs, errors.Wrapf(err, "failed to create PodVolumeBackup for pvc %s", pvc.Spec.VolumeName)) | |||
There was a problem hiding this comment.
is it the write error message?
Shouldn't it be failed to create indexer for pvb and with the pvb information. It seems there will be an error only when the input param is not a valid k8s object
pkg/podvolume/backupper.go
Outdated
| @@ -337,7 +367,8 @@ func (b *backupper) WaitAllPodVolumesProcessed(log logrus.FieldLogger) []*velero | |||
| case <-b.ctx.Done(): | |||
| log.Error("timed out waiting for all PodVolumeBackups to complete") | |||
| case <-done: | |||
| for _, pvb := range b.result { | |||
| for _, obj := range b.pvbIndexer.List() { | |||
| pvb := obj.(*velerov1api.PodVolumeBackup) | |||
There was a problem hiding this comment.
Is there a risk for panic? Maybe we should be a little more defensive to log an error and continue?
pkg/podvolume/backupper.go
Outdated
| if !exist { | ||
| return nil, nil | ||
| } | ||
| return obj.(*velerov1api.PodVolumeBackup), nil |
pkg/podvolume/backupper.go
Outdated
| } | ||
| var pvbs []*velerov1api.PodVolumeBackup | ||
| for _, obj := range objs { | ||
| pvbs = append(pvbs, obj.(*velerov1api.PodVolumeBackup)) |
…server to avoid API server issue Check the PVB status via podvolume Backupper rather than calling API server to avoid API server issue Fixes vmware-tanzu#8587 Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
ywk253100
force-pushed
the
20250109_pvb
branch
from
b12df50 to
25b5c44
Compare
blackpiglet
approved these changes
Jan 10, 2025
Lyndon-Li
approved these changes
Jan 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check the PVB status via podvolume Backupper rather than calling API server to avoid API server issue
Fixes #8587
Thank you for contributing to Velero!
Please add a summary of your change
Does your change fix a particular issue?
Fixes #(issue)
Please indicate you've done the following:
make new-changelog) or comment/kind changelog-not-requiredon this PR.site/content/docs/main.