From 7f28eda9be9131bdfc18bf704c0dcb06680e94cf Mon Sep 17 00:00:00 2001 From: Hongchao Deng Date: Sun, 7 Aug 2016 16:10:18 -0700 Subject: [PATCH] storage interface: remove Backends() --- pkg/storage/cacher.go | 5 ----- pkg/storage/etcd/etcd_helper.go | 17 ----------------- pkg/storage/etcd3/store.go | 14 -------------- pkg/storage/interfaces.go | 5 ----- 4 files changed, 41 deletions(-) diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index 311622289a..d78c8077d6 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -243,11 +243,6 @@ func (c *Cacher) startCaching(stopChannel <-chan struct{}) { } } -// Implements storage.Interface. -func (c *Cacher) Backends(ctx context.Context) []string { - return c.storage.Backends(ctx) -} - // Implements storage.Interface. func (c *Cacher) Versioner() Versioner { return c.storage.Versioner() diff --git a/pkg/storage/etcd/etcd_helper.go b/pkg/storage/etcd/etcd_helper.go index 3912c4e86f..507cdd27c4 100644 --- a/pkg/storage/etcd/etcd_helper.go +++ b/pkg/storage/etcd/etcd_helper.go @@ -90,23 +90,6 @@ func (h *etcdHelper) Codec() runtime.Codec { return h.codec } -// Implements storage.Interface. -func (h *etcdHelper) Backends(ctx context.Context) []string { - if ctx == nil { - glog.Errorf("Context is nil") - } - members, err := h.etcdMembersAPI.List(ctx) - if err != nil { - glog.Errorf("Error obtaining etcd members list: %q", err) - return nil - } - mlist := []string{} - for _, member := range members { - mlist = append(mlist, member.ClientURLs...) - } - return mlist -} - // Implements storage.Interface. func (h *etcdHelper) Versioner() storage.Versioner { return h.versioner diff --git a/pkg/storage/etcd3/store.go b/pkg/storage/etcd3/store.go index 88984756a6..437f284052 100644 --- a/pkg/storage/etcd3/store.go +++ b/pkg/storage/etcd3/store.go @@ -73,20 +73,6 @@ func newStore(c *clientv3.Client, codec runtime.Codec, prefix string) *store { } } -// Backends implements storage.Interface.Backends. -func (s *store) Backends(ctx context.Context) []string { - resp, err := s.client.MemberList(ctx) - if err != nil { - glog.Errorf("Error obtaining etcd members list: %q", err) - return nil - } - var mlist []string - for _, member := range resp.Members { - mlist = append(mlist, member.ClientURLs...) - } - return mlist -} - // Codec implements storage.Interface.Codec. func (s *store) Codec() runtime.Codec { return s.codec diff --git a/pkg/storage/interfaces.go b/pkg/storage/interfaces.go index b4b0aace58..a1528864b6 100644 --- a/pkg/storage/interfaces.go +++ b/pkg/storage/interfaces.go @@ -112,11 +112,6 @@ func NewUIDPreconditions(uid string) *Preconditions { // Interface offers a common interface for object marshaling/unmarshaling operations and // hides all the storage-related operations behind it. type Interface interface { - // Returns list of servers addresses of the underyling database. - // TODO: This method is used only in a single place. Consider refactoring and getting rid - // of this method from the interface. - Backends(ctx context.Context) []string - // Returns Versioner associated with this interface. Versioner() Versioner