Does this need to come in to 4.1? --David
On Tue, Mar 12, 2013 at 9:31 PM, <yas...@apache.org> wrote: > Updated Branches: > refs/heads/master bf15eb0c7 -> 630e75596 > > > CLOUDSTACK-1653: Redundant router: Fix check_heartbeat.sh malfunctional due > to delayed cron job > > The interval between keepalived.ts and keepalived.ts2 should be >= 60 seconds > in > normal condition, because every 10 seconds keepalived.ts would be updated, and > at least every 60 seconds, keepalived.ts would be copy to keepalived.ts2. > > If the interval is less than 60 seconds, then keepalived process failed to > update keepalived.ts every 10 seconds. > > Take some delay of updating into consideration, check_heartbeat.sh would use > 30 > seconds as a way to tell keepalived process is alive or not. > > > Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo > Commit: > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/630e7559 > Tree: > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/630e7559 > Diff: > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/630e7559 > > Branch: refs/heads/master > Commit: 630e75596ed6a4cf769b24900d383a05ebb25cdc > Parents: bf15eb0 > Author: Sheng Yang <sheng.y...@citrix.com> > Authored: Tue Mar 12 18:24:31 2013 -0700 > Committer: Sheng Yang <sheng.y...@citrix.com> > Committed: Tue Mar 12 18:31:31 2013 -0700 > > ---------------------------------------------------------------------- > .../root/redundant_router/check_heartbeat.sh.templ | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/630e7559/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ > ---------------------------------------------------------------------- > diff --git > a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ > > b/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ > index 908c0d8..7a980bd 100755 > --- > a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ > +++ > b/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ > @@ -22,7 +22,7 @@ then > lasttime=$(cat [RROUTER_BIN_PATH]/keepalived.ts2) > thistime=$(cat [RROUTER_BIN_PATH]/keepalived.ts) > diff=$(($thistime - $lasttime)) > - if [ $diff -gt 100 ] > + if [ $diff -lt 30] > then > echo Keepalived process is dead! >> [RROUTER_LOG] > service keepalived stop >> [RROUTER_LOG] 2>&1 >
