Skip to content

update criu to 2.10#1319

Closed
dqminh wants to merge 1 commit into
opencontainers:masterfrom
dqminh:fix-restore-overlay2
Closed

update criu to 2.10#1319
dqminh wants to merge 1 commit into
opencontainers:masterfrom
dqminh:fix-restore-overlay2

Conversation

@dqminh

@dqminh dqminh commented Feb 9, 2017

Copy link
Copy Markdown
Contributor

When running the tests under overlay2, criu failed to parse mountinfo
and return the following log

(00.009971)      1:     type overlay source overlay mnt_id 309 s_dev
0x32 / @ ./ flags 0x200000 options
seclabel,lowerdir=/var/lib/docker/overlay2/l/PYTCIQRNYY5T6DD3YV4F6URSNN:/var/lib/docker/overlay2/l/GQ7SZUXXXIO46JPSD3JCYRWTRL:/var/lib/docker/overlay2/l/P4PLTJCCERJJEXJ32J7B5CQXFM:/var/lib/docker/overlay2/l/5UCCLJKJMBUWOHZJUF4WWRKYL2:/var/lib/docker/overlay2/l/GSTVOU3X2AMMLQMLVB2QGQK6PA:/var/lib/docker/overlay2/l/SNMSZYAVJDXHZFGA2Q5KEO3EFQ:/var/lib/docker/overlay2/l/O2SK4T6N5OQAIRWOUJ5TR6BZUW:/var/lib/docker/overlay2/l/YCB5Z54JCI2KIRV4EAIYL6YVYW:/var/lib/docker/overlay2/l/OECEHKQA6DB5EBAHKFANECBPYQ:/var/lib/docker/overlay2/l/VGJYCB3U4FU3Z7YEVSAL42IJAS:/var/lib/docker/overlay2/l/4G6XUVDRFZ6YYMUH66TQQDXNWO:/var/lib/docker/overlay2/l/KD62VJNIAIA2IIAL6WPOEXBRWA:/var/lib/docker/overlay2/l/QCMHENA34ODPEO3ZAPH3FK2OCD:/var/lib/docker/overlay2/l/RRDTDKVUR2V25YTJOLHR3TLBTD:/var/lib/docker/overlay2/l/7226SNFBM2R6XOQ2WAMSBKZSBI:/var/lib/docker/overlay2/l/J5EWEIFPTC66NOKTXHHVVRT43C:/var/lib/docker/overlay2/l/D53SRXCVRCCIGQWD7MOAUIPDRF,upperdir=/var/lib/docker/overlay2/87e
(00.010001)      1: Error (proc_parse.c:1151): Bad format in 0
mountinfo:
'739dac4ad853b7873c725664d89b423c08db81e903c21815d0fda4b29fc85/diff,workdir=/var/lib/docker/overlay2/87e739dac4ad853b7873c725664d89b423c08db81e903c21815d0fda4b29fc85/work
'
(00.010009)      1: Error (mount.c:1642): Can't parse 0's mountinfo
(00.025661) Error (cr-restore.c:1933): Restoring FAILED.

criu upstream added a workaround xemul/criu@fb4f28f
This upgrades out current criu in test to the latest version.

Fixes: #1070

@dqminh

dqminh commented Feb 9, 2017

Copy link
Copy Markdown
Contributor Author

@avagin @crosbymichael failure in jenkins look weird. Does the builder have ipv6 ? If not ( i assume), shouldnt criu detect and not doing ip6tables-restore ?

@avagin

avagin commented Feb 10, 2017

Copy link
Copy Markdown
Contributor

CRIU tried to lock network traffic:
https://github.com/xemul/criu/blob/master/criu/net.c#L1768

@avagin

avagin commented Feb 10, 2017

Copy link
Copy Markdown
Contributor

CRIU blocks ipv6 traffic if /proc/sys/net/ipv6 exists...

When running the tests under overlay2, criu failed to parse mountinfo
and return the following log

```
(00.009971)      1:     type overlay source overlay mnt_id 309 s_dev
0x32 / @ ./ flags 0x200000 options
seclabel,lowerdir=/var/lib/docker/overlay2/l/PYTCIQRNYY5T6DD3YV4F6URSNN:/var/lib/docker/overlay2/l/GQ7SZUXXXIO46JPSD3JCYRWTRL:/var/lib/docker/overlay2/l/P4PLTJCCERJJEXJ32J7B5CQXFM:/var/lib/docker/overlay2/l/5UCCLJKJMBUWOHZJUF4WWRKYL2:/var/lib/docker/overlay2/l/GSTVOU3X2AMMLQMLVB2QGQK6PA:/var/lib/docker/overlay2/l/SNMSZYAVJDXHZFGA2Q5KEO3EFQ:/var/lib/docker/overlay2/l/O2SK4T6N5OQAIRWOUJ5TR6BZUW:/var/lib/docker/overlay2/l/YCB5Z54JCI2KIRV4EAIYL6YVYW:/var/lib/docker/overlay2/l/OECEHKQA6DB5EBAHKFANECBPYQ:/var/lib/docker/overlay2/l/VGJYCB3U4FU3Z7YEVSAL42IJAS:/var/lib/docker/overlay2/l/4G6XUVDRFZ6YYMUH66TQQDXNWO:/var/lib/docker/overlay2/l/KD62VJNIAIA2IIAL6WPOEXBRWA:/var/lib/docker/overlay2/l/QCMHENA34ODPEO3ZAPH3FK2OCD:/var/lib/docker/overlay2/l/RRDTDKVUR2V25YTJOLHR3TLBTD:/var/lib/docker/overlay2/l/7226SNFBM2R6XOQ2WAMSBKZSBI:/var/lib/docker/overlay2/l/J5EWEIFPTC66NOKTXHHVVRT43C:/var/lib/docker/overlay2/l/D53SRXCVRCCIGQWD7MOAUIPDRF,upperdir=/var/lib/docker/overlay2/87e
(00.010001)      1: Error (proc_parse.c:1151): Bad format in 0
mountinfo:
'739dac4ad853b7873c725664d89b423c08db81e903c21815d0fda4b29fc85/diff,workdir=/var/lib/docker/overlay2/87e739dac4ad853b7873c725664d89b423c08db81e903c21815d0fda4b29fc85/work
'
(00.010009)      1: Error (mount.c:1642): Can't parse 0's mountinfo
(00.025661) Error (cr-restore.c:1933): Restoring FAILED.
```

criu upstream added a workaround xemul/criu@fb4f28f
This upgrades out current criu in test to the latest version.

Fixes: opencontainers#1070

Signed-off-by: Daniel Dao <dqminh89@gmail.com>
@dqminh dqminh force-pushed the fix-restore-overlay2 branch from efe9fed to bd2133b Compare February 22, 2017 22:27
@dqminh

dqminh commented Feb 23, 2017

Copy link
Copy Markdown
Contributor Author

@avagin yah im not sure actually. building locally works for me.

@crosbymichael can we retry the jenkins build ?

@dqminh

dqminh commented Mar 3, 2017

Copy link
Copy Markdown
Contributor Author

Closing because #1355 also does this and more

@dqminh dqminh closed this Mar 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants