Remove noisy non-error lines from logs

This commit is contained in:
Tim Hockin 2014-06-23 17:58:21 -07:00
parent c5c6084325
commit 228156dbc6
2 changed files with 7 additions and 9 deletions

View File

@ -458,7 +458,9 @@ func (kl *Kubelet) WatchFile(file string, updateChannel chan<- manifestUpdate) {
fileInfo, err := os.Stat(file) fileInfo, err := os.Stat(file)
if err != nil { if err != nil {
if !os.IsNotExist(err) {
log.Printf("Error polling file: %#v", err) log.Printf("Error polling file: %#v", err)
}
return return
} }
if fileInfo.IsDir() { if fileInfo.IsDir() {
@ -510,14 +512,10 @@ func (kl *Kubelet) ResponseToManifests(response *etcd.Response) ([]api.Container
func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error { func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error {
response, err := kl.Client.Get(key+"/kubelet", true, false) response, err := kl.Client.Get(key+"/kubelet", true, false)
if err != nil { if err != nil {
log.Printf("Error on get on %s: %#v", key, err) if util.IsEtcdNotFound(err) {
switch err.(type) {
case *etcd.EtcdError:
etcdError := err.(*etcd.EtcdError)
if etcdError.ErrorCode == 100 {
return nil return nil
} }
} log.Printf("Error on etcd get of %s: %#v", key, err)
return err return err
} }
manifests, err := kl.ResponseToManifests(response) manifests, err := kl.ResponseToManifests(response)

View File

@ -71,7 +71,7 @@ func (f *FakeEtcdClient) Get(key string, sort, recursive bool) (*etcd.Response,
result := f.Data[key] result := f.Data[key]
if result.R == nil { if result.R == nil {
f.t.Errorf("Unexpected get for %s", key) f.t.Errorf("Unexpected get for %s", key)
return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100} return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100} // Key not found
} }
return result.R, result.E return result.R, result.E
} }