You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/26 19:50:18 UTC
[1/2] git commit: updated refs/heads/4.7 to d9429f6
Repository: cloudstack
Updated Branches:
refs/heads/4.7 5ccebf0f2 -> d9429f6ad
lower the time we wait for interfaces to appear
They might never appear.. for example when we have entries in
/etc/cloudstack/ips.json that haven't been plugged yet. Waiting
this long makes everything horribly slow (every vm, interface,
static route, etc, etc, will hit this wait, for every device).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3636ad11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3636ad11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3636ad11
Branch: refs/heads/4.7
Commit: 3636ad1114a89101ed0a14520572b5f0203d454b
Parents: ef115ab
Author: Remi Bergsma <gi...@remi.nl>
Authored: Thu Feb 25 22:48:54 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Thu Apr 7 20:52:33 2016 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3636ad11/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index 1b39b38..0d0a497 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -235,8 +235,7 @@ class CsDevice:
continue
self.devlist.append(vals[0])
- def waitfordevice(self, timeout=15):
- """ Wait up to 15 seconds for a device to become available """
+ def waitfordevice(self, timeout=2):
count = 0
while count < timeout:
if self.dev in self.devlist:
[2/2] git commit: updated refs/heads/4.7 to d9429f6
Posted by sw...@apache.org.
Merge pull request #1471 from remibergsma/47_lower_interface_wait
Lower the time we wait for interfaces to appearWaiting for interfaces is tricky. They might never appear.. for example when we have entries in `/etc/cloudstack/ips.json` that haven't been plugged yet. Waiting this long makes everything horribly slow (every vm, interface, static route, etc, etc, will hit this wait, for every device). We've seen CloudStack send an `ip_assoc.json` command for `eth1` public nic only and then the router goes crazy waiting for all other interfaces that were there before reboot and aren't there. If only the router would return to the mgt server a success of `eth1`, it would get the command for `eth2` etc etc. Obviously, a destroy works much faster because no state services, so no knowledge of previous devices so no waits :-)
After a stop/start the router has state in `/etc/cloudstack/ips.json` and every commands waits. Eventually hitting the hardcoded 120 sec timeout.
* pr/1471:
lower the time we wait for interfaces to appear
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d9429f6a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d9429f6a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d9429f6a
Branch: refs/heads/4.7
Commit: d9429f6add4e463b7502577d79212af959c0795f
Parents: 5ccebf0 3636ad1
Author: Will Stevens <wi...@gmail.com>
Authored: Thu May 26 15:49:49 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu May 26 15:49:50 2016 -0400
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d9429f6a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------