On Tue, Feb 12, 2013 at 1:24 PM, Chip Childers <chip.child...@sungard.com> wrote: > Edison and Wei, > > Shouldn't this patch be cherry-picked over to the 4.1 branch too? > > On Tue, Feb 12, 2013 at 05:24:21PM +0000, edi...@apache.org wrote: >> Updated Branches: >> refs/heads/master 03b8181dc -> 1e24892df >> >> >> If filesystem in virtual router is in read-only state, reports error to >> commands send to virtual router, instead of keeping silence. >> >> Test: >> >> Before change: >> (1) Acquire IP. always in "Allocating" state. >> (2) EnableStaticNat, the result is success(it is incorrect). >> (3) DisableStaticNat, will get error message.. This is correct. >> (4) Add Firewalls. always in "Adding" state. >> (5) The AgentManager report statistics every 60 minutes(normally it >> should be router.stats.interval=5 minutes). >> >> After change: >> (1) Acquire IP, will get error message. >> (2) EnableStaticNat, will get error message. >> (3) DisableStaticNat, will get error message. >> (4) Add Firewalls, will get error message. But the firewall rules are >> saved in database. >> (5) The AgentManager report statistics every 5 minutes, except the >> network with read-only FS virtual router. >> >> >> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo >> Commit: >> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1e24892d >> Tree: >> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1e24892d >> Diff: >> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1e24892d >> >> Branch: refs/heads/master >> Commit: 1e24892dfe6dfcd60372d901bea71831ebea44ea >> Parents: 03b8181 >> Author: Wei Zhou <w.z...@leaseweb.com> >> Authored: Tue Feb 12 09:22:04 2013 -0800 >> Committer: Edison Su <sudi...@gmail.com> >> Committed: Tue Feb 12 09:22:04 2013 -0800 >> >> ---------------------------------------------------------------------- >> patches/systemvm/debian/config/root/func.sh | 6 +++++- >> 1 files changed, 5 insertions(+), 1 deletions(-) >> ---------------------------------------------------------------------- >> >> >> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1e24892d/patches/systemvm/debian/config/root/func.sh >> ---------------------------------------------------------------------- >> diff --git a/patches/systemvm/debian/config/root/func.sh >> b/patches/systemvm/debian/config/root/func.sh >> index 4047a40..86317a0 100644 >> --- a/patches/systemvm/debian/config/root/func.sh >> +++ b/patches/systemvm/debian/config/root/func.sh >> @@ -42,7 +42,11 @@ getLockFile() { >> >> psline=`ps u $$` >> echo $psline > $__LOCKFILE >> - >> + if [ ! -e $__LOCKFILE ] >> + then >> + return >> + fi >> + >> for i in `seq 1 $(($__TIMEOUT * 10))` >> do >> currlock=`ls -tr /tmp/$1-*.lock | head -n1` >> >>
I wonder if it shouldn't be in 4.0 as well. --David
