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

repo ensurer: fix channel lifecycles 

Signed-off-by: Steve Kriss <krisss@vmware.com>
pull/1367/head
Steve Kriss 2019-04-12 13:42:16 -06:00
parent 5d06bd4ab9
commit 44acdcbc60
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/restic/repository_ensurer.go
View File

@ -90,7 +90,6 @@ func newRepositoryEnsurer(repoInformer velerov1informers.ResticRepositoryInforme
}
repoChan <- newObj
delete(r.repoChans, key)
},
},
)
@ -164,8 +163,11 @@ func (r *repositoryEnsurer) EnsureRepo(ctx context.Context, namespace, volumeNam
},
}
repoChan := r.getrepoChan(selector.String())
defer close(repoChan)
repoChan := r.getRepoChan(selector.String())
defer func() {
delete(r.repoChans, selector.String())
close(repoChan)
}()
if _, err := r.repoClient.ResticRepositories(namespace).Create(repo); err != nil {
return nil, errors.Wrapf(err, "unable to create restic repository resource")
@ -187,7 +189,7 @@ func (r *repositoryEnsurer) EnsureRepo(ctx context.Context, namespace, volumeNam
}
}
func (r *repositoryEnsurer) getrepoChan(name string) chan *velerov1api.ResticRepository {
func (r *repositoryEnsurer) getRepoChan(name string) chan *velerov1api.ResticRepository {
r.repoChansLock.Lock()
defer r.repoChansLock.Unlock()