- 02 Sep, 2014 20 commits
-
-
Pavel Emelyanov authored
If we open a file, lock one, fork, then close and open the file in parent again, lock should 'slide' to the child process anyway. Signed-off-by:Pavel Emelyanov <xemul@parallels.com>
-
Pavel Emelyanov authored
Inherited flock is the one that a task got from its parent. In case parent closes the corresponding fd, the /proc/locks still shows the parent pid, while the lock is owned by child. Signed-off-by: -
Pavel Emelyanov authored
Shared here means that a flock is visible from two tasks -- the owner one and its child. Signed-off-by: -
Pavel Emelyanov authored
We have a problem with file locks (bug #2512) -- the /proc/locks file shows the ID of lock creator, not the owner. Thus, if the creator died, but holder is still alive, criu fails to dump the lock held by latter task. The proposal is to find who _might_ hold the lock by checking for dev:inode pairs on lock vs file descriptors being dumped. If the creator of the lock is still alive, then he will take the priority. One thing to note about flocks -- these belong to file entries, not to tasks. Thus, when we meet one, we should check whether the flock is really held by task's FD by trying to set yet another one. In case of success -- lock really belongs to fd we dump, in case it doesn't trylock should fail. At the very end -- walk the list of locks and dump them all at once, which is possible by merge of per-task file-locks images into one global one. Signed-off-by: -
Pavel Emelyanov authored
Same reason as for previous patch. Signed-off-by: -
Pavel Emelyanov authored
Currently we keep the lock type (posix/flock) till the time we dump it, then "decode" it into binary value. I will need the easy-to-check one early, so parse the kind in proc_parse. Signed-off-by: -
Pavel Emelyanov authored
Signed-off-by: -
Andrey Vagin authored
We can't dump netlink socket, inotify, fanotify, if they have queued data, so lets add a function to chech this. Signed-off-by:
Andrey Vagin <avagin@openvz.org> Acked-by:
Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by:
-
Ruslan Kuprieiev authored
Signed-off-by:
Ruslan Kuprieiev <kupruser@gmail.com> Acked-by:
Kir Kolyshkin <kir@openvz.org> Signed-off-by:
-
Ruslan Kuprieiev authored
Check for setproctitle_init, as old versions of libbsd don't have one. Reported-by:
-
Ruslan Kuprieiev authored
Signed-off-by:
-
Andrey Vagin authored
Usually /tmp is a mount point. Recently we found a bug in criu, when it restore mount fanotify on "./" instead of "/". The test didn't find it, because they are pointed on the same mount point. Signed-off-by:
-
Andrey Vagin authored
We try to remove mark on the correct mount point and if the mark is restored on a wrong mount point, we will get ENOENT. Signed-off-by:
-
Andrew Vagin authored
Each mountpoint belongs to a mount namespace, so we need to find a root of the mount namespace and open mountpoint ralative to this root. The same logic is used in get_mark_path(). Signed-off-by:
-
Andrew Vagin authored
I'm scared, when I see smth like that: rm: cannot remove ‘/var/lib/jenkins/jobs/CRIU/workspace/test/dump/static/cgroup00/31195/1/.criu.cgyard.6qctPl/systemd/tasks’: Operation not permitted v2: do that only in the "test" directory Reported-by: Mr Jenkins Signed-off-by:
-
Andrey Vagin authored
Signed-off-by:
-
Andrey Vagin authored
It's cleaned up accoding with following statements: * files_id can't be zero (look at dump_task_kobj_ids) * item->ids is allocated for all non-dead tasks * a parent can't be dead In addition here is a tiny coding stype fix. Fixes: 475bb1e7 ("rst: Evaluate per-task clone mask early") Signed-off-by:
-
Andrey Vagin authored
We are going to collect all objects in a list and write them into the eventpoll image. The eventpoll tfd image will be depricated. Signed-off-by:
-
Andrey Vagin authored
We are going to collect all objects in a list and write them into the fanotify image. The fanotify mark image will be depricated. Signed-off-by:
-
Andrey Vagin authored
We are going to collect all objects in a list and write them into the inotify image. The inotify wd image will be depricated. v2: cb() must always free an entry Signed-off-by:
-
- 01 Sep, 2014 1 commit
-
-
Pavel Emelyanov authored
It's been a long delay since 1.2, but we did it :) The greatest new acheivement is finally support for Docker and LXC on CRIU side. Some work is still to be don on the other, but here in CRIU everything is ready. Another notable things are AArch64 support and, of course, a lot of bugfixes. Further plan is to make releases be not so rare :) Signed-off-by:
-
- 29 Aug, 2014 2 commits
-
-
Tycho Andersen authored
This is really just the last bit of c32046c9; if restore_one_task() fails, we need to do the same futex wakeup we do everywhere else in this function. v2: use err instead of err_fini_mnt after mount has been finalized normally Signed-off-by:
Tycho Andersen <tycho.andersen@canonical.com> Acked-by:
Acked-by: Andrew Vagin <avagin@parallels.com> Signed-off-by:
-
Pavel Tikhomirov authored
In container c/r(OVZ) UNIX socket uid and gid restored from connected peer credentials instead of inode once. https://bugzilla.openvz.org/show_bug.cgi?id=2969 changes: v2 - cleanup headers, close socket, use err instead fail, print id's on error. v3 - wrong patch v4 - move to sockets00, correct patch-message v5 - minor cleanup Signed-off-by:
Pavel Tikhomirov <ptikhomirov@parallels.com> Acked-by:
-
- 28 Aug, 2014 2 commits
-
-
Tycho Andersen authored
Once the task restore has failed, we can just abort, no need to restore the cg props. Signed-off-by:
-
Tycho Andersen authored
When in --restore-detached (i.e. root_as_sibling) mode, we ptrace(PTRACE_SEIZE) the root task to receive its SIGCHLD in case one of its child tasks dies. However, we don't receive a SIGCHLD if the root task itself dies, so we must explicitly abort. Signed-off-by:
-
- 27 Aug, 2014 2 commits
-
-
Filipe Brandenburger authored
A kernel without that option configured does not have /dev/pts/ptmx, so fallback to the previous way of creating it using mknod instead. The previous code was trying to bind mount ptmx on top of a symlink, which does not actually work... Keep only the symlink call and use a relative symlink instead. Adjust the error message of the symlink case to mention symlink() instead of mknod() and also /dev/ptmx instead of /dev/pts. Tested: - zdtm test suite runs on ^ns/static/.* before and after the change. - Same on a kernel with CONFIG_DEVPTS_MULTIPLE_INSTANCES unset. Signed-off-by:
Filipe Brandenburger <filbranden@google.com> Acked-by:
-
Saied Kazemi authored
When dumping Docker containers using the AUFS graph driver, we can use the --root option instead of --aufs-root for specifying the container's root. This patch obviates the need for --aufs-root and makes dump CLI more consistent with restore CLI. Signed-off-by:
Saied Kazemi <saied@google.com> Signed-off-by:
-
- 26 Aug, 2014 11 commits
-
-
Andrey Vagin authored
rmdir is executed for non-existent directories, so we don't check an exit code of this operation. This patch executs rmdir only for existent directories and check an exit code of rmdir. Signed-off-by:
-
Andrey Vagin authored
In this job tests are dumped and resumed. The cgroup02 test checks, that it is moved in another set of cgroups, but this is done on restore. Output file: test/zdtm/live/static/cgroup02.out> ------------------------------------------------------------------------------ 14:35:55.127: 85: found cgroup at cgroup02.test/zdtmtst> 14:35:55.127: 85: found cgroup at cgroup02.test/defaultroot> 14:35:55.127: 85: FAIL: cgroup02.c:132: oldroot not rewritten to zdtmtstroot! v2: typo fix Signed-off-by:
-
Filipe Brandenburger authored
Signed-off-by:
-
Filipe Brandenburger authored
Signed-off-by:
-
Filipe Brandenburger authored
Use a single awk script to parse the ldd output. Filter out other cases that are clearly not libraries, such as static builds ("not a dynamic executable") and linux-gate.so. Make the grep for vdso more specific into linux-vdso.so. Tested: - sudo test/zdtm.sh '^ns/.*' Signed-off-by: -
Filipe Brandenburger authored
Unfortunately, grep -P is not ubiquitous, so use awk with two regexps to simulate the negative forward lookup in the grep -P expression. Using awk doesn't really make it too unreadable, as using boolean operators such as && and || might actually make it more intuitive than the extended regexp. Tested: - sudo make -C test zdtm_ns - sudo make -C test zdtm_nons Signed-off-by:
-
Pavel Emelyanov authored
From avagin@: And here is one more problem. the newroot directory is created for all controllers, but currently test cleans up it only for the zdtmtst controller. We need to find a way to clean up all other conntrollers. Tests are executed on a node, which is rebooted only for updating kernel, so if we will not clean up all other controllers, we can eat all memory. Signed-off-by:
-
Andrey Vagin authored
When "make test" is executed, CFLAGS is exported from the root Makefile. These flags define _GNU_SOURCE, so we don't need to define it in the souce file. In addition unistd.h isn't included, so a few functions are shown as undeclared. make zdtm_ns make[3]: Entering directory `/root/criu/test' gcc -O2 -Wall -Werror -DCONFIG_X86_64 -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE zdtm_ct.c -o zdtm_ct zdtm_ct.c:1:0: error: "_GNU_SOURCE" redefined [-Werror] #define _GNU_SOURCE ^ <command-line>:0:0: note: this is the location of the previous definition zdtm_ct.c: In function ‘main’: zdtm_ct.c:21:2: error: implicit declaration of function ‘fork’ [-Werror=implicit-function-declaration] pid = fork(); ^ zdtm_ct.c:23:3: error: implicit declaration of function ‘setsid’ [-Werror=implicit-function-declaration] if (setsid() == -1) { ^ zdtm_ct.c:49:3: error: implicit declaration of function ‘execv’ [-Werror=implicit-function-declaration] execv(argv[1], argv + 1); ^ zdtm_ct.c:62:3: error: implicit declaration of function ‘getpid’ [-Werror=implicit-function-declaration] kill(getpid(), WTERMSIG(status)); ^ cc1: all warnings being treated as errors Signed-off-by: -
Andrew Vagin authored
fini_cgroup umounts a cgyard directory, which is mounted in prepare_cgroup(). Reported-by: Mr Jenkins Signed-off-by:
-
Andrew Vagin authored
Without this patch, we dump somethin like this: { cnames: "hugetlb" dirs: { dir_name: "" children: { dir_name: "ewroot" children: <empty> properties: <empty> } properties: <empty> } } It's obvious, that dir_name should be newroot. The problem is reproduced, if a task leaves in "/" and has a subgroup. This issue was caught by a chance. The cgroup02 test doesn't clean up controllers and leaves the "newroot" there. So when we executed a cgroup test after cgroup02, we could find many directories like "ewroot", "wroot", etc. This patch fixes this issue. Signed-off-by: -
Filipe Brandenburger authored
The return values were getting dangerously close to the range of meaningful values, in particular the next candidate 63 is equal to '?' which is the typical return value in case of error. The return values for long options may be any integer, so bump them up to outside the ascii range, start above 1000. For ease of review this patch, keep the existing range (41-62) and increment each value by 1000. Tested: - Ran "criu --help", works fine. - Manual dump and restore with some of the options, worked fine. - Ran the zdtm test suite, tests passed. Signed-off-by:
-
- 22 Aug, 2014 2 commits
-
-
Andrey Vagin authored
Signed-off-by:
-
Pavel Emelyanov authored
Signed-off-by:
-
