Return all healthy minions instead of only returning the first several
healthy minions. Without the PR, if the first minion failed with health
check, the machine list is empty, thus GET /api/v1beta1/pods failed
with code 500
This commit is contained in:
Dawn Chen 2014-07-29 00:24:53 -07:00
parent cd0b25f1e5
commit 58008510a0

View File

@ -21,6 +21,7 @@ import (
"net/http"
"github.com/GoogleCloudPlatform/kubernetes/pkg/health"
"github.com/golang/glog"
)
type HealthyMinionRegistry struct {
@ -50,7 +51,8 @@ func (h *HealthyMinionRegistry) List() (currentMinions []string, err error) {
for _, minion := range list {
status, err := health.Check(h.makeMinionURL(minion), h.client)
if err != nil {
return result, err
glog.Errorf("%s failed health check with error: %s", minion, err)
continue
}
if status == health.Healthy {
result = append(result, minion)