Merge pull request #46615 from gmarek/log-monitor

Automatic merge from submit-queue (batch tested with PRs 45488, 45335, 45909, 46074, 46615)

Make log-monitor give up on trying to ssh to a dead node after some time

Fix #38263
This commit is contained in:
Kubernetes Submit Queue 2017-05-30 03:47:04 -07:00 committed by GitHub
commit f1cf1f9cf5

View File

@ -249,9 +249,13 @@ func (g *LogSizeGatherer) Work() bool {
) )
if err != nil { if err != nil {
Logf("Error while trying to SSH to %v, skipping probe. Error: %v", workItem.ip, err) Logf("Error while trying to SSH to %v, skipping probe. Error: %v", workItem.ip, err)
if workItem.backoffMultiplier < 128 { // In case of repeated error give up.
workItem.backoffMultiplier *= 2 if workItem.backoffMultiplier >= 128 {
Logf("Failed to ssh to a node %v multiple times in a row. Giving up.", workItem.ip)
g.wg.Done()
return false
} }
workItem.backoffMultiplier *= 2
go g.pushWorkItem(workItem) go g.pushWorkItem(workItem)
return true return true
} }