mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Switch events history to use LRU cache instead of map
This commit is contained in:
parent
842867e298
commit
2735e6a495
4
Godeps/Godeps.json
generated
4
Godeps/Godeps.json
generated
@ -109,6 +109,10 @@
|
|||||||
"ImportPath": "github.com/golang/glog",
|
"ImportPath": "github.com/golang/glog",
|
||||||
"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
|
"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"ImportPath": "github.com/golang/groupcache/lru",
|
||||||
|
"Rev": "604ed5785183e59ae2789449d89e73f3a2a77987"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ImportPath": "github.com/golang/protobuf/proto",
|
"ImportPath": "github.com/golang/protobuf/proto",
|
||||||
"Rev": "7f07925444bb51fa4cf9dfe6f7661876f8852275"
|
"Rev": "7f07925444bb51fa4cf9dfe6f7661876f8852275"
|
||||||
|
121
Godeps/_workspace/src/github.com/golang/groupcache/lru/lru.go
generated
vendored
Normal file
121
Godeps/_workspace/src/github.com/golang/groupcache/lru/lru.go
generated
vendored
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2013 Google Inc.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Package lru implements an LRU cache.
|
||||||
|
package lru
|
||||||
|
|
||||||
|
import "container/list"
|
||||||
|
|
||||||
|
// Cache is an LRU cache. It is not safe for concurrent access.
|
||||||
|
type Cache struct {
|
||||||
|
// MaxEntries is the maximum number of cache entries before
|
||||||
|
// an item is evicted. Zero means no limit.
|
||||||
|
MaxEntries int
|
||||||
|
|
||||||
|
// OnEvicted optionally specificies a callback function to be
|
||||||
|
// executed when an entry is purged from the cache.
|
||||||
|
OnEvicted func(key Key, value interface{})
|
||||||
|
|
||||||
|
ll *list.List
|
||||||
|
cache map[interface{}]*list.Element
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Key may be any value that is comparable. See http://golang.org/ref/spec#Comparison_operators
|
||||||
|
type Key interface{}
|
||||||
|
|
||||||
|
type entry struct {
|
||||||
|
key Key
|
||||||
|
value interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// New creates a new Cache.
|
||||||
|
// If maxEntries is zero, the cache has no limit and it's assumed
|
||||||
|
// that eviction is done by the caller.
|
||||||
|
func New(maxEntries int) *Cache {
|
||||||
|
return &Cache{
|
||||||
|
MaxEntries: maxEntries,
|
||||||
|
ll: list.New(),
|
||||||
|
cache: make(map[interface{}]*list.Element),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add adds a value to the cache.
|
||||||
|
func (c *Cache) Add(key Key, value interface{}) {
|
||||||
|
if c.cache == nil {
|
||||||
|
c.cache = make(map[interface{}]*list.Element)
|
||||||
|
c.ll = list.New()
|
||||||
|
}
|
||||||
|
if ee, ok := c.cache[key]; ok {
|
||||||
|
c.ll.MoveToFront(ee)
|
||||||
|
ee.Value.(*entry).value = value
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ele := c.ll.PushFront(&entry{key, value})
|
||||||
|
c.cache[key] = ele
|
||||||
|
if c.MaxEntries != 0 && c.ll.Len() > c.MaxEntries {
|
||||||
|
c.RemoveOldest()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get looks up a key's value from the cache.
|
||||||
|
func (c *Cache) Get(key Key) (value interface{}, ok bool) {
|
||||||
|
if c.cache == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ele, hit := c.cache[key]; hit {
|
||||||
|
c.ll.MoveToFront(ele)
|
||||||
|
return ele.Value.(*entry).value, true
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove removes the provided key from the cache.
|
||||||
|
func (c *Cache) Remove(key Key) {
|
||||||
|
if c.cache == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ele, hit := c.cache[key]; hit {
|
||||||
|
c.removeElement(ele)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RemoveOldest removes the oldest item from the cache.
|
||||||
|
func (c *Cache) RemoveOldest() {
|
||||||
|
if c.cache == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ele := c.ll.Back()
|
||||||
|
if ele != nil {
|
||||||
|
c.removeElement(ele)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Cache) removeElement(e *list.Element) {
|
||||||
|
c.ll.Remove(e)
|
||||||
|
kv := e.Value.(*entry)
|
||||||
|
delete(c.cache, kv.key)
|
||||||
|
if c.OnEvicted != nil {
|
||||||
|
c.OnEvicted(kv.key, kv.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Len returns the number of items in the cache.
|
||||||
|
func (c *Cache) Len() int {
|
||||||
|
if c.cache == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return c.ll.Len()
|
||||||
|
}
|
73
Godeps/_workspace/src/github.com/golang/groupcache/lru/lru_test.go
generated
vendored
Normal file
73
Godeps/_workspace/src/github.com/golang/groupcache/lru/lru_test.go
generated
vendored
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2013 Google Inc.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package lru
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
type simpleStruct struct {
|
||||||
|
int
|
||||||
|
string
|
||||||
|
}
|
||||||
|
|
||||||
|
type complexStruct struct {
|
||||||
|
int
|
||||||
|
simpleStruct
|
||||||
|
}
|
||||||
|
|
||||||
|
var getTests = []struct {
|
||||||
|
name string
|
||||||
|
keyToAdd interface{}
|
||||||
|
keyToGet interface{}
|
||||||
|
expectedOk bool
|
||||||
|
}{
|
||||||
|
{"string_hit", "myKey", "myKey", true},
|
||||||
|
{"string_miss", "myKey", "nonsense", false},
|
||||||
|
{"simple_struct_hit", simpleStruct{1, "two"}, simpleStruct{1, "two"}, true},
|
||||||
|
{"simeple_struct_miss", simpleStruct{1, "two"}, simpleStruct{0, "noway"}, false},
|
||||||
|
{"complex_struct_hit", complexStruct{1, simpleStruct{2, "three"}},
|
||||||
|
complexStruct{1, simpleStruct{2, "three"}}, true},
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGet(t *testing.T) {
|
||||||
|
for _, tt := range getTests {
|
||||||
|
lru := New(0)
|
||||||
|
lru.Add(tt.keyToAdd, 1234)
|
||||||
|
val, ok := lru.Get(tt.keyToGet)
|
||||||
|
if ok != tt.expectedOk {
|
||||||
|
t.Fatalf("%s: cache hit = %v; want %v", tt.name, ok, !ok)
|
||||||
|
} else if ok && val != 1234 {
|
||||||
|
t.Fatalf("%s expected get to return 1234 but got %v", tt.name, val)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRemove(t *testing.T) {
|
||||||
|
lru := New(0)
|
||||||
|
lru.Add("myKey", 1234)
|
||||||
|
if val, ok := lru.Get("myKey"); !ok {
|
||||||
|
t.Fatal("TestRemove returned no match")
|
||||||
|
} else if val != 1234 {
|
||||||
|
t.Fatalf("TestRemove failed. Expected %d, got %v", 1234, val)
|
||||||
|
}
|
||||||
|
|
||||||
|
lru.Remove("myKey")
|
||||||
|
if _, ok := lru.Get("myKey"); ok {
|
||||||
|
t.Fatal("TestRemove returned a removed entry")
|
||||||
|
}
|
||||||
|
}
|
@ -59,7 +59,7 @@ func StartRecording(recorder EventRecorder, source api.EventSource) watch.Interf
|
|||||||
event = &eventCopy
|
event = &eventCopy
|
||||||
event.Source = source
|
event.Source = source
|
||||||
|
|
||||||
previousEvent := GetEvent(event)
|
previousEvent := getEvent(event)
|
||||||
updateExistingEvent := previousEvent.Count > 0
|
updateExistingEvent := previousEvent.Count > 0
|
||||||
if updateExistingEvent {
|
if updateExistingEvent {
|
||||||
event.Count = previousEvent.Count + 1
|
event.Count = previousEvent.Count + 1
|
||||||
@ -102,7 +102,7 @@ func recordEvent(recorder EventRecorder, event *api.Event, updateExistingEvent b
|
|||||||
newEvent, err = recorder.Create(event)
|
newEvent, err = recorder.Create(event)
|
||||||
}
|
}
|
||||||
if err == nil {
|
if err == nil {
|
||||||
AddOrUpdateEvent(newEvent)
|
addOrUpdateEvent(newEvent)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,10 +19,11 @@ package record
|
|||||||
import (
|
import (
|
||||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
|
"github.com/golang/groupcache/lru"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
type History struct {
|
type history struct {
|
||||||
// The number of times the event has occured since first occurance.
|
// The number of times the event has occured since first occurance.
|
||||||
Count int
|
Count int
|
||||||
|
|
||||||
@ -36,36 +37,52 @@ type History struct {
|
|||||||
ResourceVersion string
|
ResourceVersion string
|
||||||
}
|
}
|
||||||
|
|
||||||
type historyMap struct {
|
const (
|
||||||
|
maxLruCacheEntries = 4096
|
||||||
|
)
|
||||||
|
|
||||||
|
type historyCache struct {
|
||||||
sync.RWMutex
|
sync.RWMutex
|
||||||
table map[string]History
|
cache *lru.Cache
|
||||||
}
|
}
|
||||||
|
|
||||||
var previousEvents = historyMap{table: make(map[string]History)}
|
var previousEvents = historyCache{cache: lru.New(maxLruCacheEntries)}
|
||||||
|
|
||||||
// AddOrUpdateEvent creates a new entry for the given event in the previous events hash table if the event
|
// addOrUpdateEvent creates a new entry for the given event in the previous events hash table if the event
|
||||||
// doesn't already exist, otherwise it updates the existing entry.
|
// doesn't already exist, otherwise it updates the existing entry.
|
||||||
func AddOrUpdateEvent(newEvent *api.Event) History {
|
func addOrUpdateEvent(newEvent *api.Event) history {
|
||||||
key := getEventKey(newEvent)
|
key := getEventKey(newEvent)
|
||||||
previousEvents.Lock()
|
previousEvents.Lock()
|
||||||
defer previousEvents.Unlock()
|
defer previousEvents.Unlock()
|
||||||
previousEvents.table[key] =
|
previousEvents.cache.Add(
|
||||||
History{
|
key,
|
||||||
|
history{
|
||||||
Count: newEvent.Count,
|
Count: newEvent.Count,
|
||||||
FirstTimestamp: newEvent.FirstTimestamp,
|
FirstTimestamp: newEvent.FirstTimestamp,
|
||||||
Name: newEvent.Name,
|
Name: newEvent.Name,
|
||||||
ResourceVersion: newEvent.ResourceVersion,
|
ResourceVersion: newEvent.ResourceVersion,
|
||||||
}
|
})
|
||||||
return previousEvents.table[key]
|
return getEventFromCache(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetEvent returns the entry corresponding to the given event, if one exists, otherwise a History object
|
// getEvent returns the entry corresponding to the given event, if one exists, otherwise a history object
|
||||||
// with a count of 1 is returned.
|
// with a count of 0 is returned.
|
||||||
func GetEvent(event *api.Event) History {
|
func getEvent(event *api.Event) history {
|
||||||
key := getEventKey(event)
|
key := getEventKey(event)
|
||||||
previousEvents.RLock()
|
previousEvents.RLock()
|
||||||
defer previousEvents.RUnlock()
|
defer previousEvents.RUnlock()
|
||||||
return previousEvents.table[key]
|
return getEventFromCache(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getEventFromCache(key string) history {
|
||||||
|
value, ok := previousEvents.cache.Get(key)
|
||||||
|
if ok {
|
||||||
|
historyValue, ok := value.(history)
|
||||||
|
if ok {
|
||||||
|
return historyValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return history{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getEventKey(event *api.Event) string {
|
func getEventKey(event *api.Event) string {
|
||||||
|
@ -45,7 +45,7 @@ func TestAddOrUpdateEventNoExisting(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
result := AddOrUpdateEvent(&event)
|
result := addOrUpdateEvent(&event)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
compareEventWithHistoryEntry(&event, &result, t)
|
compareEventWithHistoryEntry(&event, &result, t)
|
||||||
@ -99,9 +99,9 @@ func TestAddOrUpdateEventExisting(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
AddOrUpdateEvent(&event1)
|
addOrUpdateEvent(&event1)
|
||||||
result1 := AddOrUpdateEvent(&event2)
|
result1 := addOrUpdateEvent(&event2)
|
||||||
result2 := GetEvent(&event1)
|
result2 := getEvent(&event1)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
compareEventWithHistoryEntry(&event2, &result1, t)
|
compareEventWithHistoryEntry(&event2, &result1, t)
|
||||||
@ -128,7 +128,7 @@ func TestGetEventNoExisting(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
existingEvent := GetEvent(&event)
|
existingEvent := getEvent(&event)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
if existingEvent.Count != 0 {
|
if existingEvent.Count != 0 {
|
||||||
@ -157,16 +157,16 @@ func TestGetEventExisting(t *testing.T) {
|
|||||||
FirstTimestamp: eventTime,
|
FirstTimestamp: eventTime,
|
||||||
LastTimestamp: eventTime,
|
LastTimestamp: eventTime,
|
||||||
}
|
}
|
||||||
AddOrUpdateEvent(&event)
|
addOrUpdateEvent(&event)
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
existingEvent := GetEvent(&event)
|
existingEvent := getEvent(&event)
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
compareEventWithHistoryEntry(&event, &existingEvent, t)
|
compareEventWithHistoryEntry(&event, &existingEvent, t)
|
||||||
}
|
}
|
||||||
|
|
||||||
func compareEventWithHistoryEntry(expected *api.Event, actual *History, t *testing.T) {
|
func compareEventWithHistoryEntry(expected *api.Event, actual *history, t *testing.T) {
|
||||||
|
|
||||||
if actual.Count != expected.Count {
|
if actual.Count != expected.Count {
|
||||||
t.Fatalf("There should be one existing instance of this event in the hash table.")
|
t.Fatalf("There should be one existing instance of this event in the hash table.")
|
||||||
|
Loading…
Reference in New Issue
Block a user