Changes in lxc-test-checkpoint-restore http://src.iws.cs.ovgu.de/source/rss/lxc/src/tests/lxc-test-checkpoint-restore en Copyright 2005 Java tests: Kill containers (don't wait for shutdown) We waste a lot of time waiting for Ubuntu containers to cleanly stop right before we destroy them anyway. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> /lxc/src/tests/lxc-test-checkpoint-restore - 8bb165038d60d59084c1fafee171948244f0f86a Stéphane Graber <stgraber@ubuntu.com> Wait on correct container name Signed-off-by: Laurence Rowe <l@lrowe.co.uk> /lxc/src/tests/lxc-test-checkpoint-restore - da0e298c675005c690769b05b9ed03fe643fd726 Laurence Rowe <l@lrowe.co.uk> tests: require criu >= 1.3.1 for criu test CRIU 1.3 has a pretty crippling deadlock which will cause dumping containers to fail fairly often. This is fixed in criu 1.3.1, so we shouldn't run the tests on anything less than that. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> /lxc/src/tests/lxc-test-checkpoint-restore - d48d22299d4fc5635f289e4a34967e6cd99cd743 Tycho Andersen <tycho.andersen@canonical.com> Allow criu >= 1.3 in c/r test criu version 1.3 has been tagged, which has the minimal set of patches to allow checkpointing and restoring containers. lxc-test-checkpoint-restore is now skipped on any version of criu lower than 1.3. Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> /lxc/src/tests/lxc-test-checkpoint-restore - 5f845c928afc5c36f4c06771ce1814a16df3f5a5 Tycho Andersen <tycho.andersen@canonical.com> Add support for checkpoint and restore via CRIU This patch adds support for checkpointing and restoring containers via CRIU. It adds two api calls, ->checkpoint and ->restore, which are wrappers around the CRIU CLI. CRIU has an RPC API, but reasons for preferring exec() are discussed in [1]. To checkpoint, users specify a directory to dump the container metadata (CRIU dump files, plus some additional information about veth pairs and which bridges they are attached to) into this directory. On restore, this information is read out of the directory, a CRIU command line is constructed, and CRIU is exec()d. CRIU uses the lxc-restore-net callback (which in turn inspects the image directory with the NIC data) to properly restore the network. This will only work with the current git master of CRIU; anything as of a152c843 should work. There is a known bug where containers which have been restored cannot be checkpointed [2]. [1]: http://lists.openvz.org/pipermail/criu/2014-July/015117.html [2]: http://lists.openvz.org/pipermail/criu/2014-August/015876.html v2: fixed some problems with the s/int/bool return code form api function v3: added a testcase, fixed up the man page synopsis v4: fix a small typo in lxc-test-checkpoint-restore v5: remove a reference to the old CRIU_PATH, and a bad error about the same Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com> /lxc/src/tests/lxc-test-checkpoint-restore - 735f2c6e504a541cbb2592a3f94858bf337a24ff Tycho Andersen <tycho.andersen@canonical.com>