github/containerized-data-importer
7
0
Fork 0
mirror of https://github.com/kubevirt/containerized-data-importer.git synced 2025-06-03 06:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure expectation keys are deleted when object is deleted from cluster (#433)

Browse Source 
Signed-off-by: David Vossel <davidvossel@gmail.com>
This commit is contained in:
David Vossel 2018-09-07 08:38:28 -04:00 committed by Alexander Wels
parent 7f01fbf6c5
commit 7908038b94
5 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/clone-controller.go
View File

@ -208,10 +208,13 @@ func (c *CloneController) runPVCWorkers() {
}
func (c *CloneController) syncPvc(key string) error {
pvc, err := c.pvcFromKey(key)
pvc, exists, err := c.pvcFromKey(key)
if err != nil {
return err
} else if !exists {
c.podExpectations.DeleteExpectations(key)
}
if pvc == nil {
return nil
}

1
pkg/controller/datavolume-controller.go
View File

@ -249,6 +249,7 @@ func (c *DataVolumeController) syncHandler(key string) error {
// processing.
if k8serrors.IsNotFound(err) {
runtime.HandleError(errors.Errorf("dataVolume '%s' in work queue no longer exists", key))
c.pvcExpectations.DeleteExpectations(key)
return nil
}

6
pkg/controller/import-controller.go
View File

@ -206,10 +206,14 @@ func (c *ImportController) runPVCWorkers() {
}
func (c *ImportController) syncPvc(key string) error {
pvc, err := c.pvcFromKey(key)
pvc, exists, err := c.pvcFromKey(key)
if err != nil {
return err
} else if !exists {
c.podExpectations.DeleteExpectations(key)
return nil
}
if pvc == nil {
return nil
}

48
pkg/controller/util.go
View File

@ -25,32 +25,34 @@ const ImagePathName = "image-path"
const socketPathName = "socket-path"
// return a pvc pointer based on the passed-in work queue key.
func (c *ImportController) pvcFromKey(key interface{}) (*v1.PersistentVolumeClaim, error) {
obj, err := c.objFromKey(c.pvcInformer, key)
func (c *ImportController) pvcFromKey(key interface{}) (*v1.PersistentVolumeClaim, bool, error) {
obj, exists, err := c.objFromKey(c.pvcInformer, key)
if err != nil {
return nil, errors.Wrap(err, "could not get pvc object from key")
return nil, false, errors.Wrap(err, "could not get pvc object from key")
} else if !exists {
return nil, false, nil
}
pvc, ok := obj.(*v1.PersistentVolumeClaim)
if !ok {
return nil, errors.New("Object not of type *v1.PersistentVolumeClaim")
return nil, false, errors.New("Object not of type *v1.PersistentVolumeClaim")
}
return pvc, nil
return pvc, true, nil
}
func (c *ImportController) objFromKey(informer cache.SharedIndexInformer, key interface{}) (interface{}, error) {
func (c *ImportController) objFromKey(informer cache.SharedIndexInformer, key interface{}) (interface{}, bool, error) {
keyString, ok := key.(string)
if !ok {
return nil, errors.New("keys is not of type string")
return nil, false, errors.New("keys is not of type string")
}
obj, ok, err := informer.GetIndexer().GetByKey(keyString)
if err != nil {
return nil, errors.Wrap(err, "error getting interface obj from store")
return nil, false, errors.Wrap(err, "error getting interface obj from store")
}
if !ok {
return nil, errors.New("interface object not found in store")
return nil, false, nil
}
return obj, nil
return obj, true, nil
}
func checkPVC(pvc *v1.PersistentVolumeClaim) bool {
@ -572,9 +574,11 @@ func checkClonePVC(pvc *v1.PersistentVolumeClaim) bool {
}
func (c *CloneController) podFromKey(key interface{}) (*v1.Pod, error) {
obj, err := c.objFromKey(c.podInformer, key)
obj, exists, err := c.objFromKey(c.podInformer, key)
if err != nil {
return nil, errors.Wrap(err, "could not get pod object from key")
} else if !exists {
return nil, errors.New("interface object not found in store")
}
pod, ok := obj.(*v1.Pod)
@ -584,30 +588,32 @@ func (c *CloneController) podFromKey(key interface{}) (*v1.Pod, error) {
return pod, nil
}
func (c *CloneController) pvcFromKey(key interface{}) (*v1.PersistentVolumeClaim, error) {
obj, err := c.objFromKey(c.pvcInformer, key)
func (c *CloneController) pvcFromKey(key interface{}) (*v1.PersistentVolumeClaim, bool, error) {
obj, exists, err := c.objFromKey(c.pvcInformer, key)
if err != nil {
return nil, errors.Wrap(err, "could not get pvc object from key")
return nil, false, errors.Wrap(err, "could not get pvc object from key")
} else if !exists {
return nil, false, nil
}
pvc, ok := obj.(*v1.PersistentVolumeClaim)
if !ok {
return nil, errors.New("Object not of type *v1.PersistentVolumeClaim")
return nil, false, errors.New("Object not of type *v1.PersistentVolumeClaim")
}
return pvc, nil
return pvc, true, nil
}
func (c *CloneController) objFromKey(informer cache.SharedIndexInformer, key interface{}) (interface{}, error) {
func (c *CloneController) objFromKey(informer cache.SharedIndexInformer, key interface{}) (interface{}, bool, error) {
keyString, ok := key.(string)
if !ok {
return nil, errors.New("keys is not of type string")
return nil, false, errors.New("keys is not of type string")
}
obj, ok, err := informer.GetIndexer().GetByKey(keyString)
if err != nil {
return nil, errors.Wrap(err, "error getting interface obj from store")
return nil, false, errors.Wrap(err, "error getting interface obj from store")
}
if !ok {
return nil, errors.New("interface object not found in store")
return nil, false, nil
}
return obj, nil
return obj, true, nil
}

28
pkg/controller/util_test.go
View File

@ -51,12 +51,12 @@ func TestController_pvcFromKey(t *testing.T) {
name: "expect to not get pvc object from key",
args: args{fmt.Sprintf("%s/%s", "myns", pvc.Name)},
want: nil,
wantErr: true,
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := c.pvcFromKey(tt.args.key)
got, exists, err := c.pvcFromKey(tt.args.key)
if (err != nil) != tt.wantErr {
t.Errorf("Controller.pvcFromKey() error = %v, wantErr %v", err, tt.wantErr)
return
@ -64,6 +64,9 @@ func TestController_pvcFromKey(t *testing.T) {
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Controller.pvcFromKey() = %v, want %v", got, tt.want)
}
if tt.want == nil && exists {
t.Errorf("Controller.pvcFromKey() expected key not to exist")
}
})
}
}
@ -102,7 +105,7 @@ func TestCloneController_pvcFromKey(t *testing.T) {
name: "expect to not get pvc object from key",
args: args{fmt.Sprintf("%s/%s", "myns", pvc.Name)},
want: nil,
wantErr: true,
wantErr: false,
},
{
name: "expect to get pvc object from key",
@ -113,7 +116,7 @@ func TestCloneController_pvcFromKey(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := c.pvcFromKey(tt.args.key)
got, exists, err := c.pvcFromKey(tt.args.key)
if (err != nil) != tt.wantErr {
t.Errorf("Controller.pvcFromKey() error = %v, wantErr %v", err, tt.wantErr)
return
@ -121,6 +124,9 @@ func TestCloneController_pvcFromKey(t *testing.T) {
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Controller.pvcFromKey() = %v, want %v", got, tt.want)
}
if tt.want == nil && exists {
t.Errorf("Controller.pvcFromKey() expected key not to exist")
}
})
}
}
@ -157,12 +163,12 @@ func TestController_objFromKey(t *testing.T) {
name: "expect to not get object key",
args: args{c.pvcInformer, fmt.Sprintf("%s/%s", "myns", pvc.Name)},
want: nil,
wantErr: true,
wantErr: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := c.objFromKey(tt.args.informer, tt.args.key)
got, exists, err := c.objFromKey(tt.args.informer, tt.args.key)
if (err != nil) != tt.wantErr {
t.Errorf("Controller.objFromKey() error = %v, wantErr %v myKey = %v", err, tt.wantErr, tt.args.key)
return
@ -170,6 +176,9 @@ func TestController_objFromKey(t *testing.T) {
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Controller.objFromKey() = %v, want %v", got, tt.want)
}
if tt.want == nil && exists {
t.Errorf("Controller.pvcFromKey() expected key not to exist")
}
})
}
}
@ -208,7 +217,7 @@ func TestCloneController_objFromKey(t *testing.T) {
name: "expect to not get object key",
args: args{c.pvcInformer, fmt.Sprintf("%s/%s", "myns", pvc.Name)},
want: nil,
wantErr: true,
wantErr: false,
},
{
name: "expect to get object key",
@ -219,7 +228,7 @@ func TestCloneController_objFromKey(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := c.objFromKey(tt.args.informer, tt.args.key)
got, exists, err := c.objFromKey(tt.args.informer, tt.args.key)
if (err != nil) != tt.wantErr {
t.Errorf("Controller.objFromKey() error = %v, wantErr %v myKey = %v", err, tt.wantErr, tt.args.key)
return
@ -227,6 +236,9 @@ func TestCloneController_objFromKey(t *testing.T) {
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Controller.objFromKey() = %v, want %v", got, tt.want)
}
if tt.want == nil && exists {
t.Errorf("Controller.pvcFromKey() expected key not to exist")
}
})
}
}