[PATCH 2/2] have restart return error if error

[PATCH 2/2] have restart return error if error

[Serge E. Hallyn]

I still need this for cr_tests/userns/run_simple.sh to succeed.
All tests pass with this patch applied.

Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
---
 restart.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/restart.c b/restart.c
index cb81293..fa786ef 100644
--- a/restart.c
+++ b/restart.c
@@ -780,7 +780,7 @@ static int ckpt_parse_status(int status, int mimic, int verbose)
 		}
 	}
 
-	return 0;
+	return ret;
 }
 
 static int ckpt_collect_child(struct ckpt_ctx *ctx)
-- 
1.6.1.1

Re: [PATCH 2/2] have restart return error if error

[Oren Laadan]

Serge E. Hallyn wrote:
> I still need this for cr_tests/userns/run_simple.sh to succeed.
> All tests pass with this patch applied.
> 

But this is not the intended behavior.

The coordinator will:

1) If restart fails, exit with an error status (>0)

2) If restart succeeds, exit immediately with status 0 (--no-wait),
or (by default) wait for the restart root-task to exit, and then
exit with success status 0, regardless of the exit status (or
reason) of the restarted root-task.

What you want is that the coordinator instead will report the exit
status of the restart root-task. You can use the --copy-status
command line switch for that.

The intended behavior is that if the restarted root-task died due
to a signal, then so will the coordinator (if --copy-status is
requested). I now see that this part needs a small fix - to ensure
that the signal is not handled by the coordinator. Will fix that.

Oren.


> Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> ---
>  restart.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/restart.c b/restart.c
> index cb81293..fa786ef 100644
> --- a/restart.c
> +++ b/restart.c
> @@ -780,7 +780,7 @@ static int ckpt_parse_status(int status, int mimic, int verbose)
>  		}
>  	}
>  
> -	return 0;
> +	return ret;
>  }
>  
>  static int ckpt_collect_child(struct ckpt_ctx *ctx)

Re: [PATCH 2/2] have restart return error if error

[Serge E. Hallyn]

Quoting Oren Laadan (orenl-RdfvBDnrOixBDgjK7y7TUQ@public.gmane.org):
> 
> Serge E. Hallyn wrote:
> > I still need this for cr_tests/userns/run_simple.sh to succeed.
> > All tests pass with this patch applied.
> > 
> 
> But this is not the intended behavior.
> 
> The coordinator will:
> 
> 1) If restart fails, exit with an error status (>0)

But restart is failing, and the coordinator is not exiting with
error status.

> 2) If restart succeeds, exit immediately with status 0 (--no-wait),
> or (by default) wait for the restart root-task to exit, and then
> exit with success status 0, regardless of the exit status (or
> reason) of the restarted root-task.
> 
> What you want is that the coordinator instead will report the exit
> status of the restart root-task. You can use the --copy-status
> command line switch for that.
> 
> The intended behavior is that if the restarted root-task died due
> to a signal, then so will the coordinator (if --copy-status is
> requested). I now see that this part needs a small fix - to ensure
> that the signal is not handled by the coordinator. Will fix that.
> 
> Oren.
> 
> 
> > Signed-off-by: Serge E. Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> > ---
> >  restart.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/restart.c b/restart.c
> > index cb81293..fa786ef 100644
> > --- a/restart.c
> > +++ b/restart.c
> > @@ -780,7 +780,7 @@ static int ckpt_parse_status(int status, int mimic, int verbose)
> >  		}
> >  	}
> >  
> > -	return 0;
> > +	return ret;
> >  }
> >  
> >  static int ckpt_collect_child(struct ckpt_ctx *ctx)