packages/lxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!43 lxc: do not communicat with lxc parent when unpause

Browse Source 
Merge pull request !43 from lifeng_isula/master
This commit is contained in:
openeuler-ci-bot 2020-07-10 16:20:41 +08:00 committed by Gitee
commit b33e4c438e
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
0070-freeze-do-not-communicate-to-lxc-parent-when-unpause.patch Normal file
View File

@ -0,0 +1,72 @@
From e0387970de1ba7517dcfe88f32297775d90126f5 Mon Sep 17 00:00:00 2001
From: lifeng68 <lifeng68@huawei.com>
Date: Fri, 10 Jul 2020 11:51:20 +0800
Subject: [PATCH 2/2] freeze: do not communicate to lxc parent when unpause
Signed-off-by: lifeng68 <lifeng68@huawei.com>
---
src/lxc/lxccontainer.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 6281a8a72..eef98df67 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -516,6 +516,20 @@ static bool do_lxcapi_is_running(struct lxc_container *c)
WRAP_API(bool, lxcapi_is_running)
+#ifdef HAVE_ISULAD
+static bool do_lxcapi_freeze(struct lxc_container *c)
+{
+ if (!c || !c->lxc_conf) {
+ return false;
+ }
+
+ if (lxc_freeze(c->lxc_conf, c->name, c->config_path) < 0) {
+ return false;
+ }
+
+ return true;
+}
+#else
static bool do_lxcapi_freeze(struct lxc_container *c)
{
lxc_state_t s;
@@ -529,9 +543,25 @@ static bool do_lxcapi_freeze(struct lxc_container *c)
return true;
}
+#endif
+
WRAP_API(bool, lxcapi_freeze)
+#ifdef HAVE_ISULAD
+static bool do_lxcapi_unfreeze(struct lxc_container *c)
+{
+ if (!c || !c->lxc_conf) {
+ return false;
+ }
+
+ if (lxc_unfreeze(c->lxc_conf, c->name, c->config_path) < 0) {
+ return false;
+ }
+
+ return true;
+}
+#else
static bool do_lxcapi_unfreeze(struct lxc_container *c)
{
lxc_state_t s;
@@ -545,6 +575,7 @@ static bool do_lxcapi_unfreeze(struct lxc_container *c)
return true;
}
+#endif
WRAP_API(bool, lxcapi_unfreeze)
--
2.25.1

3
lxc.spec
View File

@ -1,4 +1,4 @@
%global _release 2020062401 %global _release 2020071001
%global debug_package %{nil} %global debug_package %{nil}
Name: lxc Name: lxc
@ -77,6 +77,7 @@ Patch9065: 0066-lxc-fix-tests-build-error.patch
Patch9066: 0067-set-normal-ret-value-when-populate-exist-device-successfully.patch Patch9066: 0067-set-normal-ret-value-when-populate-exist-device-successfully.patch
Patch9067: 0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch Patch9067: 0068-lxc-config-default-cgroup-pattern-to-lxc-n.patch
Patch9068: 0069-rootfs-support-use-host-rootfs-as-container-rootfs.patch Patch9068: 0069-rootfs-support-use-host-rootfs-as-container-rootfs.patch
Patch9069: 0070-freeze-do-not-communicate-to-lxc-parent-when-unpause.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)