[CRIU] [PATCH 3/5] criu: check that ghost files are cleaned up in error cases

Pavel Emelyanov xemul at virtuozzo.com
Mon May 23 10:05:24 PDT 2016


On 05/21/2016 12:59 AM, Andrew Vagin wrote:
> On Fri, May 20, 2016 at 02:17:40PM +0300, Pavel Emelyanov wrote:
>>> diff --git a/criu/include/fault-injection.h b/criu/include/fault-injection.h
>>> index f1e5c72..1861702 100644
>>> --- a/criu/include/fault-injection.h
>>> +++ b/criu/include/fault-injection.h
>>> @@ -7,6 +7,8 @@ enum faults {
>>>  	FI_DUMP_EARLY,
>>>  	FI_RESTORE_ROOT_ONLY,
>>>  	FI_DUMP_PAGES,
>>> +	FI_CLEAN_REMAPS,	/* before creating mount namespaces */
>>> +	FI_CLEAN_REMAPS2,	/* after creating mount namespaces */
>>
>> There's FI_RESTORE_ROOT_ONLY injection that was added exactly for
>> this -- to check that ghost files are removed. Why is it not enough?
> 
> FI_CLEAN_REMAPS2 is executed when all tasks called restore_task_mnt_ns()

How about FI_CLEAN_REMAPS?
Also -- can we give these faults names that mean "what's the status of
dump/restore when this fault happens"?

> FI_RESTORE_ROOT_ONLY is called when a root task called
> restore_task_mnt_ns()

But the different zdtm test is used for them. Can it be unified?

-- Pavel


More information about the CRIU mailing list