Merge branch 'master' into default-db-roles

This commit is contained in:
Felix Kunde
2019-10-04 18:14:23 +02:00
31 changed files with 633 additions and 451 deletions
+1 -1
View File
@@ -312,7 +312,7 @@ func (c *Controller) processClusterEventsQueue(idx int, stopCh <-chan struct{},
for {
obj, err := c.clusterEventQueues[idx].Pop(cache.PopProcessFunc(func(interface{}) error { return nil }))
if err != nil {
if err == cache.FIFOClosedError {
if err == cache.ErrFIFOClosed {
return
}
c.logger.Errorf("error when processing cluster events queue: %v", err)