777884 - Bug in watcher means that it will never reboot if max # of "strikes" is greater than 1 when pinging external machine

Status: RESOLVED FIXED

(Testing Graveyard :: SUTAgent, defect)

Description

[William Lachance (:wlach)]

Unfortunately when doing some cleanup related to bug 721936, I accidentally messed up some logic. Specifically I consolidated the code to check if we've exceeded the maximum number of failed ping targets to this statement:

if (!sRet.contains("3 received") && ++nStrikes >= nMaxStrikes) {
...
} else {
  nStrikes = 0;
}

As I should have realized, this will never work as the if clause will never evaluate to "true" if nMaxStrikes > 1 (which it is by default). We need to do the second check inside the body of the if statement. Easy fix.

Comment 1

[William Lachance (:wlach)]

Attachment: Fix code in watcher to reboot if maximum number of failed ping attempts exceeded

Pretty straightforward patch, builds on earlier work in bug 777836 (which will have to be applied before this one)

Comment 2

[William Lachance (:wlach)]

Comment on attachment 646292 [details] [diff] [review]
Fix code in watcher to reboot if maximum number of failed ping attempts exceeded

This basically just fixes a bug I introduced earlier (see bug description).

Comment 3

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 646292 [details] [diff] [review]
Fix code in watcher to reboot if maximum number of failed ping attempts exceeded

Review of attachment 646292 [details] [diff] [review]:
-----------------------------------------------------------------

I like simple patches.

Comment 4

[William Lachance (:wlach)]

Inbound: https://hg.mozilla.org/integration/mozilla-inbound/rev/cb6ccdd22f5a

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/cb6ccdd22f5a