github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30197 from hongchaodeng/r1

Browse Source 
Automatic merge from submit-queue

storage interface: remove Backends()



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30197)
<!-- Reviewable:end -->
This commit is contained in:
Kubernetes Submit Queue 2016-08-10 00:45:29 -07:00 committed by GitHub
commit 0da589fa9c
4 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/storage/cacher.go
View File

@ -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()

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

@ -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

14
pkg/storage/etcd3/store.go
View File

@ -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

5
pkg/storage/interfaces.go
View File

@ -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