when VR is rebooted, CloudStack will reapply all ips/rules to VR, this patch will reduce time the VR reboot takes - remove 1 s sleep in vmware - reduce the time arping takes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d298b55 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d298b55 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d298b55 Branch: refs/heads/advancedsg-leaseweb Commit: 4d298b550303701dc33e451e03aa6fcefe31b9e3 Parents: 28261b5 Author: Anthony Xu <[email protected]> Authored: Wed May 29 13:45:07 2013 -0700 Committer: Wei Zhou <[email protected]> Committed: Tue Jun 11 10:49:17 2013 +0200 ---------------------------------------------------------------------- patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh | 6 ++++-- utils/src/com/cloud/utils/ssh/SshHelper.java | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d298b55/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh b/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh index f326fac..d23ec00 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh @@ -227,7 +227,8 @@ add_first_ip() { if [ $if_keep_state -ne 1 -o $old_state -ne 0 ] then sudo ip link set $ethDev up - sudo arping -c 3 -I $ethDev -A -U -s $ipNoMask $ipNoMask; + sudo arping -c 1 -I $ethDev -A -U -s $ipNoMask $ipNoMask; + sudo arping -c 1 -I $ethDev -A -U -s $ipNoMask $ipNoMask; fi add_routing $1 @@ -273,7 +274,8 @@ add_an_ip () { if [ $if_keep_state -ne 1 -o $old_state -ne 0 ] then sudo ip link set $ethDev up - sudo arping -c 3 -I $ethDev -A -U -s $ipNoMask $ipNoMask; + sudo arping -c 1 -I $ethDev -A -U -s $ipNoMask $ipNoMask; + sudo arping -c 1 -I $ethDev -A -U -s $ipNoMask $ipNoMask; fi add_routing $1 return $? http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d298b55/utils/src/com/cloud/utils/ssh/SshHelper.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/ssh/SshHelper.java b/utils/src/com/cloud/utils/ssh/SshHelper.java index 6ee87ad..fb81e50 100755 --- a/utils/src/com/cloud/utils/ssh/SshHelper.java +++ b/utils/src/com/cloud/utils/ssh/SshHelper.java @@ -146,10 +146,6 @@ public class SshHelper { } sess = conn.openSession(); - // There is a bug in Trilead library, wait a second before - // starting a shell and executing commands, from http://spci.st.ewi.tudelft.nl/chiron/xref/nl/tudelft/swerl/util/SSHConnection.html - Thread.sleep(1000); - sess.execCommand(command); InputStream stdout = sess.getStdout();
