github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16384 from derekwaynecarr/fix_memory_churn_etcd_helper

Browse Source 
Large amount of memory churn in etcd helper prefixing keys
This commit is contained in:
krousey
2015-10-29 10:02:07 -07:00
parent f0e6ae4b8f caebe7300b
commit 848fed8f4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/storage/etcd/etcd_helper.go
View File

@@ -44,7 +44,7 @@ func NewEtcdStorage(client tools.EtcdClient, codec runtime.Codec, prefix string)
codec: codec,
versioner: APIObjectVersioner{},
copier: api.Scheme,
pathPrefix: prefix,
pathPrefix: path.Join("/", prefix),
cache: util.NewCache(maxEtcdCacheEntries),
}
}
@@ -489,10 +489,10 @@ func (h *etcdHelper) GuaranteedUpdate(ctx context.Context, key string, ptrToType
}
func (h *etcdHelper) prefixEtcdKey(key string) string {
if strings.HasPrefix(key, path.Join("/", h.pathPrefix)) {
if strings.HasPrefix(key, h.pathPrefix) {
return key
}
return path.Join("/", h.pathPrefix, key)
return path.Join(h.pathPrefix, key)
}
// etcdCache defines interface used for caching objects stored in etcd. Objects are keyed by