Repository: cloudstack Updated Branches: refs/heads/4.8 b80696cbc -> 7974bfd31
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.8 Commit: 3636ad1114a89101ed0a14520572b5f0203d454b Parents: ef115ab Author: Remi Bergsma <git...@remi.nl> Authored: Thu Feb 25 22:48:54 2016 +0100 Committer: Remi Bergsma <git...@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:
