github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32576 from wongma7/revert-30825-pv-controller-informer

Browse Source 
Automatic merge from submit-queue

Revert "Use PV shared informer in PV controller"

Fixes #32497 

Reverts kubernetes/kubernetes#30825
This commit is contained in:
Kubernetes Submit Queue
2016-09-15 04:37:29 -07:00
committed by GitHub
parent dbdaf2c22b 25e9b9dcf9
commit 843d7cd24c
6 changed files with 44 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/volume/persistentvolume/controller.go
View File

@@ -154,8 +154,8 @@ const createProvisionedPVInterval = 10 * time.Second
// framework.Controllers that watch PersistentVolume and PersistentVolumeClaim
// changes.
type PersistentVolumeController struct {
volumeController framework.ControllerInterface
pvInformer framework.SharedIndexInformer
volumeController *framework.Controller
volumeSource cache.ListerWatcher
claimController *framework.Controller
claimSource cache.ListerWatcher
classReflector *cache.Reflector
@@ -176,13 +176,6 @@ type PersistentVolumeController struct {
claims cache.Store
classes cache.Store
// isInformerInternal is true if the informer we hold is a personal informer,
// false if it is a shared informer. If we're using a normal shared informer,
// then the informer will be started for us. If we have a personal informer,
// we must start it ourselves. If you start the controller using
// NewPersistentVolumeController(passing SharedInformer), this will be false.
isInformerInternal bool
// Map of scheduled/running operations.
runningOperations goroutinemap.GoRoutineMap