- 12 Dec, 2016 11 commits
-
-
Pavel Emelyanov authored
Remove getting opts from descriptors out from scm engine, this stuff is pure criu thing, so make it collect the data. The tricky change here is that parasite code needs memory to keep fd_opts on. The memory is taken from parasite args region, which is now bigger than it used to be. But that's not a big deal, as previously this space was allocated on the parasite stack (!, but with smaller chunks). On the other hand, now we have one memcpy less, as opts are put directly into the destination buffer. travis-ci: success for files: Rework send/recv-fds to be more generic Signed-off-by:Pavel Emelyanov <xemul@virtuozzo.com>
-
Cyrill Gorcunov authored
Currently criu built with criu/pie-util-fd (which is a symlink to criu/pie/util-fd) with same flags as we use in general compel infection code. Moreover the criu link with libcompel.a, so we get a problem where send_fds/recv_fds are multiple defined. Lets rather unweave this mess: - drop criu/pie-util-fd.c completely - move send_fd/recv_fd inliners into scm.h Signed-off-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Cyrill Gorcunov authored
- Declare send_fds, recv_fds in sch.h, these are prototypes used in both compel and criu - Drop old protos from plugin-fds.h uapi file - Drop old code from fds.c source Signed-off-by:
-
Cyrill Gorcunov authored
When SCM_FDSET_HAS_OPTS is not set the scm-code.c can't be built because it declares struct fd_opts in parameters. Lets rather hide this type and allow to build without SCM_FDSET_HAS_OPTS definition. Signed-off-by:
-
Cyrill Gorcunov authored
Signed-off-by:
-
Pavel Emelyanov authored
Signed-off-by: -
Pavel Emelyanov authored
In pure-compel library messing with opts is not required, only criu and criu's pie will need it, so make it possible to compile out common/scm-code's opts management. Signed-off-by: -
Pavel Emelyanov authored
Depending on the code using it, memcpy will be different. Signed-off-by: -
Pavel Emelyanov authored
Signed-off-by: -
Pavel Emelyanov authored
This is quite a tiny bigfix mostly release. One interesting thing, though, is that CRIU can now be built with clang on all the supported architectures :) Signed-off-by: -
Adrian Reber authored
Based on debian's manpage from Salvatore Bonaccorso: e708a3a Sync manpage for crit to include short explanation for new subcommands 7dd571a Fix position for optional arguments in crit's manpage 017f8d9 Add minimal manpage for the crit travis-ci: success for crit: added crit manpage Signed-off-by:
Adrian Reber <areber@redhat.com> Signed-off-by:
-
- 09 Dec, 2016 17 commits
-
-
Andrei Vagin authored
page_in_parent() returns true for all not dirty pages, probably it should not be executed for zero pages. ------------------------ grep Error ------------------------ (00.115327) Error (criu/pagemap.c:191): Missing 8000 in parent pagemap, current iov: base=9000,len=32768 (00.115329) Error (criu/page-xfer.c:237): Hole 0x8000/4096 not found in parent (00.160222) Error (criu/cr-dump.c:1636): Dumping FAILED. ------------------------ ERROR OVER ------------------------ Signed-off-by:
Andrei Vagin <avagin@virtuozzo.com> Signed-off-by:
-
Andrei Vagin authored
https://github.com/xemul/criu/issues/253 travis-ci: success for test: don't execute cgroup03 with other cgroup tests concurrently Signed-off-by:
-
Dmitry Safonov authored
Before: =[log]=> dump/zdtm/transition/shmem/142/1/dump.log ------------------------ grep Error ------------------------ pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> ------------------------ ERROR OVER ------------------------ After: =[log]=> dump/zdtm/transition/shmem/62/1/dump.log ------------------------ grep Error ------------------------ pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 1: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4 pie: 1: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 1: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4 pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 5: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4 pie: 5: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 5: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4 pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 6: e/asm/parasite.h:45): Failed to dump TLS descriptor #13: -4 pie: 6: Error (/home/travis/build/0x7f454c46/criu/criu/arch/x86/includ> pie: 6: e/asm/parasite.h:45): Failed to dump TLS descriptor #14: -4 ------------------------ ERROR OVER ------------------------ Signed-off-by:
Dmitry Safonov <dsafonov@virtuozzo.com> Signed-off-by:
-
Andrei Vagin authored
Signed-off-by:
-
Andrei Vagin authored
If a mount overmounts something else, we can try to restore it separetly and then move it to the right places after restoring all mounts. In this patch if we see that a mount is overmounts something, we create a new directory in the root yard and restore this mount and its sub-tree in this directory. https://bugs.openvz.org/browse/OVZ-6778 v2: add more comments rename roots_mp into roots_yard_mp v3: rename functions Signed-off-by:
-
Andrei Vagin authored
It is preparation to handle over-mounts. v2: don't set the same name for global and local variables Signed-off-by:
-
Andrei Vagin authored
It will be used to handle overmounts Signed-off-by:
-
Andrei Vagin authored
Signed-off-by:
-
Yixun Lan authored
Since glibc is moving away from implicitly including sys/sysmacros.h all the time via sys/types.h, include the header directly in more places. This seems to cover most makedev/major/minor usage. Signed-off-by:
Yixun Lan <dlan@gentoo.org> Signed-off-by:
Mike Frysinger <vapier@gentoo.org> Reviewed-by:
-
Cyrill Gorcunov authored
travis-ci: success for restore: Report error number if PR_SET_MM failed Reported-by:
-
Adrian Reber authored
To run the test zdtm/static/sched_policy00 /sys/fs/cgroup/cpu/user.slice/cpu.cfs_period_us needs to be non zero. This changes it to 100 during the test and resets it to the original value once the test finishes. travis-ci: success for zdtm: set cpu.cfs_period_us to 100 during sched_policy00 test Signed-off-by:
-
Andrei Vagin authored
Currently when we have a shared group, we set a source mount for all of them and then we need to update a source mount when we mount a first mount from a shared group, because a shared id can be only inherited. Signed-off-by:
-
Andrei Vagin authored
This function is going to be used more than once. v2: don't change logic in this patch Signed-off-by:
-
Cyrill Gorcunov authored
One level always been handled properly but two levels may cause problems. travis-ci: success for Multiple nested deleted dentries fix Signed-off-by:
-
Cyrill Gorcunov authored
In case if several levels of dentries are missed we can't restore them otherwise. travis-ci: success for Multiple nested deleted dentries fix Signed-off-by:
-
Cyrill Gorcunov authored
- take @mode into account - return system error codes on error travis-ci: success for Multiple nested deleted dentries fix Signed-off-by:
-
Andrei Vagin authored
https://github.com/xemul/criu/issues/260 https://travis-ci.org/avagin/criu/builds/182462796 https://ci.openvz.org/job/CRIU/job/criu-patchwork/941//console v2: don't call page_pipe_add_hole for zero pages Signed-off-by:
-
- 05 Dec, 2016 12 commits
-
-
Raghavendra Prabhu authored
In some distros (such as Arch), libxtables_standard is part of iptables as `/usr/lib/iptables/libxt_standard.so`. With this change, the test passes, otherwise netns-nf test fails. Tested with make test. Signed-off-by:
Raghavendra D Prabhu <me@rdprabhu.com> Signed-off-by:
-
Kirill Tkhai authored
Negative retval is error, while 0 is OK. v2: More places travis-ci: success for criu: Fix open() retval analysing Signed-off-by:
Kirill Tkhai <ktkhai@virtuozzo.com> Acked-by:
-
Andrei Vagin authored
CRIU uses iptables rules to block tcp connections and if rules are added at the tail of the chain, other rules can accept packets which have to be blocked. travis-ci: success for series starting with [01/21] build: install libnet-dev Signed-off-by:
-
Mike Rapoport authored
Currently it's possible to continue testing despite failures only when running zdtm.py with --all option. Let's make --keep-going option also valid when more than one test is requested with --tests or --from. Signed-off-by:
Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by:
-
Pavel Emelyanov authored
This makes crit show the type, which is handy. Also this will let us deprecate the old format where remap type was encoded into remap ID. travis-ci: success for files: Explicitly set linked remap type Signed-off-by: -
Kir Kolyshkin authored
This is an addition to commit 6273a5c ("Add ability to restore with missing sysctls on the target node"). travis-ci: success for Document --weak-syscalls Cc: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Signed-off-by:Kir Kolyshkin <kir@openvz.org> Acked-by:
Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Signed-off-by:
-
Kir Kolyshkin authored
Option --help should provide a brief information, like a list of commands and options and their meaning, ideally no more than 1 line per option. There is no need to describe nuances and details here, since we have documentation (wiki and man pages) for that. travis-ci: success for Document --weak-syscalls Cc: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> Signed-off-by:
-
Pavel Tikhomirov authored
Signed-off-by:
-
Pavel Tikhomirov authored
Do it through new --weak-sysctls option to "criu restore". When we migrate from source with newer kernel with some modern sysctl to destination with older kernel without it or just with a kernel configured without it (e.g. no CONFIG_IPV6_ROUTER_PREF), we face a problem that not all of dumped sysctls can be successfuly restored on the destination. So to address these problem introduce weak sysctls migration, where we restore only available sysctls and skip others. https://github.com/xemul/criu/issues/248 While on it, fix workaround for stable_secret eio skip. travis-ci: success for Add ability to restore with missing sysctls on the target node Signed-off-by:
-
Kir Kolyshkin authored
With the recent patches, criu is finally compileable with clang for all architectures. To keep it that way, we need Travis to test that on a regular basis. The downside is, Travis build time is increased about 2x. travis-ci: success for travis: enable arm/arm64/ppc builds with clang Signed-off-by:
-
Adrian Reber authored
When using the option --keep-going to get a quick overview of the test results there is now a summary which tests have failed like: ############# 7 TEST(S) FAILED (TOTAL 268/SKIPPED 83) ############## * zdtm/static/sched_policy00(unknown) * zdtm/static/pthread00(unknown) * zdtm/static/pthread01(unknown) * zdtm/static/maps01(unknown) * zdtm/static/maps00(unknown) * zdtm/transition/maps008(unknown) * zdtm/transition/shmem(unknown) ############################### FAIL ############################### Signed-off-by:
-
Vitaly Ostrosablin authored
Those two tests use same socket name and if both of them are run simultaneously, they would fight for socket and one will get EADDRINUSE. This patch gives socket_dgram_data an unique name, so that everyone will be happy. travis-ci: success for test: fix same socket names in socket-{dgram_data, snd_addr} Acked-by:
-
