github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #732 from mfojtik/etcd_log 

Avoid log flooding with messages about missing missing registry/services
pull/6/head
Daniel Smith 2014-08-12 18:17:04 -07:00
parent 950f5a27dd afbd7a6147
commit aeea1b1e06
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/proxy/config/etcd.go
View File

@ -39,6 +39,7 @@ import (
"time" "time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/coreos/go-etcd/etcd" "github.com/coreos/go-etcd/etcd"
"github.com/golang/glog" "github.com/golang/glog"
) )
@ -77,7 +78,7 @@ func (s ConfigSourceEtcd) Run() {
if err == nil { if err == nil {
break break
} }
glog.Errorf("Failed to get any services: %v", err) glog.V(1).Infof("Failed to get any services: %v", err)
time.Sleep(s.interval) time.Sleep(s.interval)
} }
@ -117,8 +118,10 @@ func (s ConfigSourceEtcd) Run() {
func (s ConfigSourceEtcd) GetServices() ([]api.Service, []api.Endpoints, error) { func (s ConfigSourceEtcd) GetServices() ([]api.Service, []api.Endpoints, error) {
response, err := s.client.Get(registryRoot+"/specs", true, false) response, err := s.client.Get(registryRoot+"/specs", true, false)
if err != nil { if err != nil {
glog.Errorf("Failed to get the key %s: %v", registryRoot, err) glog.V(1).Infof("Failed to get the key %s: %v", registryRoot, err)
return make([]api.Service, 0), make([]api.Endpoints, 0), err if tools.IsEtcdNotFound(err) {
return []api.Service{}, []api.Endpoints{}, err
}
} }
if response.Node.Dir == true { if response.Node.Dir == true {
retServices := make([]api.Service, len(response.Node.Nodes)) retServices := make([]api.Service, len(response.Node.Nodes))
@ -136,9 +139,14 @@ func (s ConfigSourceEtcd) GetServices() ([]api.Service, []api.Endpoints, error)
retServices[i] = svc retServices[i] = svc
endpoints, err := s.GetEndpoints(svc.ID) endpoints, err := s.GetEndpoints(svc.ID)
if err != nil { if err != nil {
if tools.IsEtcdNotFound(err) {
glog.V(1).Infof("Unable to get endpoints for %s : %v", svc.ID, err)
}
glog.Errorf("Couldn't get endpoints for %s : %v skipping", svc.ID, err) glog.Errorf("Couldn't get endpoints for %s : %v skipping", svc.ID, err)
endpoints = api.Endpoints{}
} else {
glog.Infof("Got service: %s on localport %d mapping to: %s", svc.ID, svc.Port, endpoints)
} }
glog.Infof("Got service: %s on localport %d mapping to: %s", svc.ID, svc.Port, endpoints)
retEndpoints[i] = endpoints retEndpoints[i] = endpoints
} }
return retServices, retEndpoints, err return retServices, retEndpoints, err