github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41018 from kubernetes/revert-40735-avoid_copy_in_cacher

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39681, 39321, 41018, 40883)

Revert "Avoid unnecessary copies in cacher"

Reverts kubernetes/kubernetes#40735

Ref #41013

[I don't think it's related, but just in case it is...]
This commit is contained in:
Kubernetes Submit Queue 2017-02-06 10:46:58 -08:00 committed by GitHub
commit 816f90d88c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/apiserver/pkg/storage/cacher.go
View File

@ -752,7 +752,7 @@ func (c *errWatcher) Stop() {
type cacheWatcher struct { type cacheWatcher struct {
sync.Mutex sync.Mutex
copier runtime.ObjectCopier copier runtime.ObjectCopier
input chan *watchCacheEvent input chan watchCacheEvent
result chan watch.Event result chan watch.Event
done chan struct{} done chan struct{}
filter watchFilterFunc filter watchFilterFunc
@ -763,7 +763,7 @@ type cacheWatcher struct {
func newCacheWatcher(copier runtime.ObjectCopier, resourceVersion uint64, chanSize int, initEvents []*watchCacheEvent, filter watchFilterFunc, forget func(bool)) *cacheWatcher { func newCacheWatcher(copier runtime.ObjectCopier, resourceVersion uint64, chanSize int, initEvents []*watchCacheEvent, filter watchFilterFunc, forget func(bool)) *cacheWatcher {
watcher := &cacheWatcher{ watcher := &cacheWatcher{
copier: copier, copier: copier,
input: make(chan *watchCacheEvent, chanSize), input: make(chan watchCacheEvent, chanSize),
result: make(chan watch.Event, chanSize), result: make(chan watch.Event, chanSize),
done: make(chan struct{}), done: make(chan struct{}),
filter: filter, filter: filter,
@ -800,7 +800,7 @@ var timerPool sync.Pool
func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) { func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) {
// Try to send the event immediately, without blocking. // Try to send the event immediately, without blocking.
select { select {
case c.input <- event: case c.input <- *event:
return return
default: default:
} }
@ -820,7 +820,7 @@ func (c *cacheWatcher) add(event *watchCacheEvent, budget *timeBudget) {
defer timerPool.Put(t) defer timerPool.Put(t)
select { select {
case c.input <- event: case c.input <- *event:
stopped := t.Stop() stopped := t.Stop()
if !stopped { if !stopped {
// Consume triggered (but not yet received) timer event // Consume triggered (but not yet received) timer event
@ -928,7 +928,7 @@ func (c *cacheWatcher) process(initEvents []*watchCacheEvent, resourceVersion ui
} }
// only send events newer than resourceVersion // only send events newer than resourceVersion
if event.ResourceVersion > resourceVersion { if event.ResourceVersion > resourceVersion {
c.sendWatchCacheEvent(event) c.sendWatchCacheEvent(&event)
} }
} }
} }