On Fri, Jul 12, 2013 at 02:06:20PM -0700, John McFarlane wrote: > This commit increases the default timeout used by lxc-start-ephemeral > from 5 to 10, and adds support for an LXC_IP_TIMEOUT override. > > Patchset 2: > - Previous patch used a command line arg. > > Signed-off-by: John McFarlane <j...@rockfloat.com>
Hi,
That looks good, I'll apply it now with one very small change, I'll
replace LXC_IP_TIMEOUT by LXC_GETIP_TIMEOUT, that makes for an uglier
variable name but also means we won't need to rename it if LXC ever
grows some kind of network daemon that'd come with a connection timeout.
Acked-by: Stéphane Graber <stgra...@ubuntu.com>
> ---
> src/lxc/lxc-start-ephemeral.in | 2 +-
> src/python-lxc/lxc/__init__.py | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/lxc/lxc-start-ephemeral.in b/src/lxc/lxc-start-ephemeral.in
> index cb1f732..4cbf93f 100644
> --- a/src/lxc/lxc-start-ephemeral.in
> +++ b/src/lxc/lxc-start-ephemeral.in
> @@ -273,7 +273,7 @@ if not args.command and not args.daemon:
> sys.exit(0)
>
> # Try to get the IP addresses
> -ips = dest.get_ips(timeout=5)
> +ips = dest.get_ips(timeout=10)
>
> # Deal with the case where we just print info about the container
> if args.daemon:
> diff --git a/src/python-lxc/lxc/__init__.py b/src/python-lxc/lxc/__init__.py
> index 9ada7ff..c45ff9f 100644
> --- a/src/python-lxc/lxc/__init__.py
> +++ b/src/python-lxc/lxc/__init__.py
> @@ -369,6 +369,7 @@ class Container(_lxc.Container):
> kwargs['scope'] = scope
>
> ips = None
> + timeout = int(os.environ.get('LXC_IP_TIMEOUT', timeout))
>
> while not ips:
> ips = _lxc.Container.get_ips(self, **kwargs)
> --
> 1.8.1.2
>
>
> ------------------------------------------------------------------------------
> See everything from the browser to the database with AppDynamics
> Get end-to-end visibility with application monitoring from AppDynamics
> Isolate bottlenecks and diagnose root cause in seconds.
> Start your free trial of AppDynamics Pro today!
> http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel
--
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
