[lxc-devel] [PATCH 1/2] lxc-checkpoint should fail if criu gets signal

Stéphane Graber stgraber at ubuntu.com
Wed Sep 24 14:25:07 UTC 2014


On Wed, Sep 24, 2014 at 08:38:40AM -0500, Tycho Andersen wrote:
> The ->checkpoint() API call didn't exit correctly if criu was killed by a
> signal instead of exiting, so lxc-checkpoint didn't fail correctly as a result.
> 
> Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  src/lxc/lxccontainer.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index a737191..94ecc68 100644
> --- a/src/lxc/lxccontainer.c
> +++ b/src/lxc/lxccontainer.c
> @@ -3929,6 +3929,10 @@ out_unlock:
>  					goto out_fini_handler;
>  				}
>  			}
> +		} else {
> +			ERROR("CRIU was killed with signal %d\n", WTERMSIG(status));
> +			error = true;
> +			goto out_fini_handler;
>  		}
>  
>  		if (lxc_poll(c->name, handler)) {
> -- 
> 1.9.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140924/00dba1c3/attachment.sig>


More information about the lxc-devel mailing list