From caebe7300bd040222b87cda440096978c3a86b9e Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Tue, 27 Oct 2015 16:35:07 -0400 Subject: [PATCH] Large amount of memory churn in etcd helper --- pkg/storage/etcd/etcd_helper.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go index 2767e47e84b..d7a4d4de047 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/pkg/storage/etcd/etcd_helper.go @@ -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