From 1e24892dfe6dfcd60372d901bea71831ebea44ea Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 12 Feb 2013 09:22:04 -0800 Subject: [PATCH] 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. --- patches/systemvm/debian/config/root/func.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/patches/systemvm/debian/config/root/func.sh b/patches/systemvm/debian/config/root/func.sh index 4047a4047a6..86317a06843 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`