Re: [PATCH] libxl/remus: fix the return value of the checkpoint callback

[Yang Hongyang <yanghy@cn.fujitsu.com>]

On 07/15/2015 08:13 PM, Ian Campbell wrote:
> On Wed, 2015-07-15 at 18:32 +0800, Yang Hongyang wrote:
>> In checkpoint callback, we wait for the interval and then start
>> another checkpoint, so the ERROR_TIMEDOUT should be intended
>> and should not treat as error.
>>
>> This patch is based on
>> [PATCH v8 --for 4.6 COLO 00/25] COarse-grain LOck-stepping Virtual Machines for Non-stop Service
>
> Does that mean it won't apply to current staging?

No. This can apply on top of colo pre series.

>
> I think we probably want this fix ASAP rather than waiting for that
> series?

I can resubmit the patch apply to staging, but the colo pre series will need
to be rebased...

>
>> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>> CC: Ian Campbell <Ian.Campbell@citrix.com>
>> CC: Wei Liu <wei.liu2@citrix.com>
>> ---
>>   tools/libxl/libxl_remus.c | 11 +++++++----
>>   1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/libxl/libxl_remus.c b/tools/libxl/libxl_remus.c
>> index 46dcc3c..ffc92a7 100644
>> --- a/tools/libxl/libxl_remus.c
>> +++ b/tools/libxl/libxl_remus.c
>> @@ -355,11 +355,14 @@ static void remus_next_checkpoint(libxl__egc *egc, libxl__ev_time *ev,
>>        * (xc_domain_save.c). in order to continue executing the infinite loop
>>        * (suspend, checkpoint, resume) in xc_domain_save().
>>        */
>> -
>> -    if (rc)
>> +    if (rc == ERROR_TIMEDOUT) {
>> +        /* This is intended, we set the timeout and start another checkpoint */
>> +        libxl__xc_domain_saverestore_async_callback_done(egc, &dss->sws.shs, 1);
>
> Please wrap this (slightly) overlong line (and probably the comment too
> which is borderline AFAICT).
>
>> +    } else {
>>           dss->rc = rc;
>> -
>> -    libxl__xc_domain_saverestore_async_callback_done(egc, &dss->sws.shs, !rc);
>> +        libxl__xc_domain_saverestore_async_callback_done(egc,
>> +                                                         &dss->sws.shs, !rc);
>> +    }
>>   }
>>
>>   /*---------------------- remus callbacks (restore) -----------------------*/
>
>
> .
>

-- 
Thanks,
Yang.