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

backup deletion: fix setting of log level in plugin manager 

Signed-off-by: Steve Kriss <steve@heptio.com>
pull/799/head
Steve Kriss 2018-08-17 11:20:44 -07:00
parent 74043ab428
commit 3234124afe
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cmd/server/server.go
View File

@ -678,6 +678,7 @@ func (s *server) runControllers(config *api.Config) error {
backupDeletionController := controller.NewBackupDeletionController( backupDeletionController := controller.NewBackupDeletionController(
s.logger, s.logger,
s.logLevel,
s.sharedInformerFactory.Ark().V1().DeleteBackupRequests(), s.sharedInformerFactory.Ark().V1().DeleteBackupRequests(),
s.arkClient.ArkV1(), // deleteBackupRequestClient s.arkClient.ArkV1(), // deleteBackupRequestClient
s.arkClient.ArkV1(), // backupClient s.arkClient.ArkV1(), // backupClient

15
pkg/controller/backup_deletion_controller.go
View File

@ -57,16 +57,16 @@ type backupDeletionController struct {
resticMgr restic.RepositoryManager resticMgr restic.RepositoryManager
podvolumeBackupLister listers.PodVolumeBackupLister podvolumeBackupLister listers.PodVolumeBackupLister
backupLocationLister listers.BackupStorageLocationLister backupLocationLister listers.BackupStorageLocationLister
pluginRegistry plugin.Registry
deleteBackupDir cloudprovider.DeleteBackupDirFunc deleteBackupDir cloudprovider.DeleteBackupDirFunc
processRequestFunc func(*v1.DeleteBackupRequest) error processRequestFunc func(*v1.DeleteBackupRequest) error
clock clock.Clock clock clock.Clock
newPluginManager func(logger logrus.FieldLogger, logLevel logrus.Level, pluginRegistry plugin.Registry) plugin.Manager newPluginManager func(logrus.FieldLogger) plugin.Manager
} }
// NewBackupDeletionController creates a new backup deletion controller. // NewBackupDeletionController creates a new backup deletion controller.
func NewBackupDeletionController( func NewBackupDeletionController(
logger logrus.FieldLogger, logger logrus.FieldLogger,
logLevel logrus.Level,
deleteBackupRequestInformer informers.DeleteBackupRequestInformer, deleteBackupRequestInformer informers.DeleteBackupRequestInformer,
deleteBackupRequestClient arkv1client.DeleteBackupRequestsGetter, deleteBackupRequestClient arkv1client.DeleteBackupRequestsGetter,
backupClient arkv1client.BackupsGetter, backupClient arkv1client.BackupsGetter,
@ -91,12 +91,13 @@ func NewBackupDeletionController(
resticMgr: resticMgr, resticMgr: resticMgr,
podvolumeBackupLister: podvolumeBackupInformer.Lister(), podvolumeBackupLister: podvolumeBackupInformer.Lister(),
backupLocationLister: backupLocationInformer.Lister(), backupLocationLister: backupLocationInformer.Lister(),
pluginRegistry: pluginRegistry,
// use variables to refer to these functions so they can be // use variables to refer to these functions so they can be
// replaced with fakes for testing. // replaced with fakes for testing.
deleteBackupDir: cloudprovider.DeleteBackupDir, deleteBackupDir: cloudprovider.DeleteBackupDir,
newPluginManager: plugin.NewManager, newPluginManager: func(logger logrus.FieldLogger) plugin.Manager {
return plugin.NewManager(logger, logLevel, pluginRegistry)
},
clock: &clock.RealClock{}, clock: &clock.RealClock{},
} }
@ -314,8 +315,8 @@ func (c *backupDeletionController) processRequest(req *v1.DeleteBackupRequest) e
return nil return nil
} }
func (c *backupDeletionController) deleteBackupFromStorage(backup *v1.Backup, log *logrus.Entry) error { func (c *backupDeletionController) deleteBackupFromStorage(backup *v1.Backup, log logrus.FieldLogger) error {
pluginManager := c.newPluginManager(log, log.Level, c.pluginRegistry) pluginManager := c.newPluginManager(log)
defer pluginManager.CleanupClients() defer pluginManager.CleanupClients()
backupLocation, err := c.backupLocationLister.BackupStorageLocations(backup.Namespace).Get(backup.Spec.StorageLocation) backupLocation, err := c.backupLocationLister.BackupStorageLocations(backup.Namespace).Get(backup.Spec.StorageLocation)

7
pkg/controller/backup_deletion_controller_test.go
View File

@ -48,6 +48,7 @@ func TestBackupDeletionControllerProcessQueueItem(t *testing.T) {
controller := NewBackupDeletionController( controller := NewBackupDeletionController(
arktest.NewLogger(), arktest.NewLogger(),
logrus.InfoLevel,
sharedInformers.Ark().V1().DeleteBackupRequests(), sharedInformers.Ark().V1().DeleteBackupRequests(),
client.ArkV1(), // deleteBackupRequestClient client.ArkV1(), // deleteBackupRequestClient
client.ArkV1(), // backupClient client.ArkV1(), // backupClient
@ -134,6 +135,7 @@ func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletio
objectStore: objectStore, objectStore: objectStore,
controller: NewBackupDeletionController( controller: NewBackupDeletionController(
arktest.NewLogger(), arktest.NewLogger(),
logrus.InfoLevel,
sharedInformers.Ark().V1().DeleteBackupRequests(), sharedInformers.Ark().V1().DeleteBackupRequests(),
client.ArkV1(), // deleteBackupRequestClient client.ArkV1(), // deleteBackupRequestClient
client.ArkV1(), // backupClient client.ArkV1(), // backupClient
@ -150,9 +152,7 @@ func setupBackupDeletionControllerTest(objects ...runtime.Object) *backupDeletio
req: req, req: req,
} }
data.controller.newPluginManager = func(_ logrus.FieldLogger, _ logrus.Level, _ plugin.Registry) plugin.Manager { data.controller.newPluginManager = func(_ logrus.FieldLogger) plugin.Manager { return pluginManager }
return pluginManager
}
pluginManager.On("GetObjectStore", "objStoreProvider").Return(objectStore, nil) pluginManager.On("GetObjectStore", "objStoreProvider").Return(objectStore, nil)
pluginManager.On("CleanupClients").Return(nil) pluginManager.On("CleanupClients").Return(nil)
@ -594,6 +594,7 @@ func TestBackupDeletionControllerDeleteExpiredRequests(t *testing.T) {
controller := NewBackupDeletionController( controller := NewBackupDeletionController(
arktest.NewLogger(), arktest.NewLogger(),
logrus.InfoLevel,
sharedInformers.Ark().V1().DeleteBackupRequests(), sharedInformers.Ark().V1().DeleteBackupRequests(),
client.ArkV1(), // deleteBackupRequestClient client.ArkV1(), // deleteBackupRequestClient
client.ArkV1(), // backupClient client.ArkV1(), // backupClient