github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #394 from brendandburns/poddata

Browse Source 
Try to grab live data if the cache has errors.
This commit is contained in:
Tim Hockin 2014-07-11 11:55:54 -07:00
commit 1e05d1ac4e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/registry/pod_registry.go
View File

@ -86,8 +86,14 @@ func (storage *PodRegistryStorage) fillPodInfo(pod *api.Pod) {
if storage.podCache != nil {
info, err := storage.podCache.GetPodInfo(pod.CurrentState.Host, pod.ID)
if err != nil {
glog.Errorf("Error getting container info: %#v", err)
return
glog.Errorf("Error getting container info from cache: %#v", err)
if storage.podInfoGetter != nil {
info, err = storage.podInfoGetter.GetPodInfo(pod.CurrentState.Host, pod.ID)
}
if err != nil {
glog.Errorf("Error getting fresh container info: %#v", err)
return
}
}
pod.CurrentState.Info = info
netContainerInfo, ok := info["net"]