vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avoid panics if can't get block store during deletion 

Signed-off-by: Steve Kriss <steve@heptio.com>
pull/948/head
Steve Kriss 2018-10-16 15:54:05 -06:00
parent 4a03370f1d
commit 268080ad09
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/backup_deletion_controller.go
View File

@ -241,9 +241,9 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
backupStore, backupStoreErr := c.backupStoreForBackup(backup, pluginManager, log) backupStore, backupStoreErr := c.backupStoreForBackup(backup, pluginManager, log)
if backupStoreErr != nil { if backupStoreErr != nil {
errs = append(errs, backupStoreErr.Error()) errs = append(errs, backupStoreErr.Error())
// TODO need to not proceed since backupStore will be nil
} }
if backupStore != nil {
log.Info("Removing PV snapshots") log.Info("Removing PV snapshots")
if snapshots, err := backupStore.GetBackupVolumeSnapshots(backup.Name); err != nil { if snapshots, err := backupStore.GetBackupVolumeSnapshots(backup.Name); err != nil {
errs = append(errs, errors.Wrap(err, "error getting backup's volume snapshots").Error()) errs = append(errs, errors.Wrap(err, "error getting backup's volume snapshots").Error())
@ -267,6 +267,7 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
} }
} }
} }
}
log.Info("Removing restic snapshots") log.Info("Removing restic snapshots")
if deleteErrs := c.deleteResticSnapshots(backup); len(deleteErrs) > 0 { if deleteErrs := c.deleteResticSnapshots(backup); len(deleteErrs) > 0 {
@ -275,10 +276,12 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
} }
} }
if backupStore != nil {
log.Info("Removing backup from backup storage") log.Info("Removing backup from backup storage")
if err := backupStore.DeleteBackup(backup.Name); err != nil { if err := backupStore.DeleteBackup(backup.Name); err != nil {
errs = append(errs, err.Error()) errs = append(errs, err.Error())
} }
}
log.Info("Removing restores") log.Info("Removing restores")
if restores, err := c.restoreLister.Restores(backup.Namespace).List(labels.Everything()); err != nil { if restores, err := c.restoreLister.Restores(backup.Namespace).List(labels.Everything()); err != nil {