diff --git a/0001-huawei-adapt-to-huawei-4.0.3.patch b/0001-huawei-adapt-to-huawei-4.0.3.patch index 0fa1208dd47f00d3d3cfee100e9ee2ec1be1beb4..c75eba89fe25773295714bded5036fc380d5fc3a 100644 --- a/0001-huawei-adapt-to-huawei-4.0.3.patch +++ b/0001-huawei-adapt-to-huawei-4.0.3.patch @@ -1,7 +1,7 @@ From 8a62b519510080bb361cdd058d0e7a5edd955a95 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Wed, 15 Jul 2020 09:32:32 +0800 -Subject: [PATCH 1/9] huawei: adapt to huawei 4.0.3 +Subject: [PATCH 01/10] huawei: adapt to huawei 4.0.3 Signed-off-by: lifeng68 --- diff --git a/0002-add-mount-label-for-rootfs.patch b/0002-add-mount-label-for-rootfs.patch index 5f3710d148b2555566b53a3e4de61604ca27ed78..2617125c7b27611ea5b712f7d975c8b1ea4c7f1b 100644 --- a/0002-add-mount-label-for-rootfs.patch +++ b/0002-add-mount-label-for-rootfs.patch @@ -1,7 +1,7 @@ From 0b8bc902c0c7acb54efb1fd4be5121dbf9a08598 Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 15 Jul 2020 16:09:35 +0800 -Subject: [PATCH 2/9] add mount label for rootfs +Subject: [PATCH 02/10] add mount label for rootfs Signed-off-by: wujing --- diff --git a/0003-format-code-and-verify-mount-mode.patch b/0003-format-code-and-verify-mount-mode.patch index 343f95a64a717149138e2c227749094f7817a6c2..463fa48104bb6f7983cc1c4020c00a77c92c7f41 100644 --- a/0003-format-code-and-verify-mount-mode.patch +++ b/0003-format-code-and-verify-mount-mode.patch @@ -1,7 +1,7 @@ From c0f37e083c49cfcb9441743a409fdee44d32d7c5 Mon Sep 17 00:00:00 2001 From: wujing Date: Thu, 16 Jul 2020 16:39:35 +0800 -Subject: [PATCH 3/9] format code and verify mount mode +Subject: [PATCH 03/10] format code and verify mount mode Signed-off-by: wujing --- diff --git a/0004-Removes-the-definition-of-the-thread-attributes-obje.patch b/0004-Removes-the-definition-of-the-thread-attributes-obje.patch index 1cd51411b8ecf74e8b3af922e8a4e11ef2612771..da3c7b952a85a953736229bb5ed5d5734f709f32 100644 --- a/0004-Removes-the-definition-of-the-thread-attributes-obje.patch +++ b/0004-Removes-the-definition-of-the-thread-attributes-obje.patch @@ -1,7 +1,7 @@ From b1ef723b4f437aad3c0c0497174bc7d3444426cd Mon Sep 17 00:00:00 2001 From: wujing Date: Mon, 20 Jul 2020 15:30:42 +0800 -Subject: [PATCH 4/9] Removes the definition of the thread attributes object +Subject: [PATCH 04/10] Removes the definition of the thread attributes object Signed-off-by: wujing --- diff --git a/0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch b/0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch index 96070740bf6b1927e2bfd3e71abeb28ef696943e..0a6740f258d1e7b79194018a6f70b5305d231628 100644 --- a/0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch +++ b/0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch @@ -1,7 +1,7 @@ From 405b048dc82a8695b8a400524787243f3898cbd6 Mon Sep 17 00:00:00 2001 From: wujing Date: Tue, 21 Jul 2020 17:30:17 +0800 -Subject: [PATCH 5/9] solve coredump bug caused by fstype being NULL during +Subject: [PATCH 05/10] solve coredump bug caused by fstype being NULL during mount Signed-off-by: wujing diff --git a/0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch b/0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch index 8b73f5e43853a84218208387324d6485400ae160..28eb62f4c3a2ed3de5050d5a6d7b3743a3b214b5 100644 --- a/0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch +++ b/0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch @@ -1,7 +1,7 @@ From e21c6474901e3d12560eb389597e88b47fd46be5 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Fri, 11 Sep 2020 10:05:04 +0800 -Subject: [PATCH 6/9] SIGTERM: do not catch signal SIGTERM in [lxc monitor] +Subject: [PATCH 06/10] SIGTERM: do not catch signal SIGTERM in [lxc monitor] Signed-off-by: lifeng68 --- diff --git a/0007-Using-string-type-instead-of-security_context_t-beca.patch b/0007-Using-string-type-instead-of-security_context_t-beca.patch index 7b6be3e28b2c9da96a715dd384282992981ae1c7..e8aed02508051749687aad5ef2887d5c5fa4e682 100644 --- a/0007-Using-string-type-instead-of-security_context_t-beca.patch +++ b/0007-Using-string-type-instead-of-security_context_t-beca.patch @@ -1,7 +1,7 @@ From 5a8c9b52ad3291feb87c2281e074b2c85c766245 Mon Sep 17 00:00:00 2001 From: wujing Date: Fri, 25 Sep 2020 10:21:37 +0800 -Subject: [PATCH 7/9] Using string type instead of security_context_t because +Subject: [PATCH 07/10] Using string type instead of security_context_t because it is deprecated Signed-off-by: wujing diff --git a/0008-hook-pass-correct-mount-dir-as-root-to-hook.patch b/0008-hook-pass-correct-mount-dir-as-root-to-hook.patch index 5fd48e21ee0a3139dbbb1b5f77d1e63a1af793dc..a7e2efe600f03c0cf171147c0959a1bcc57e6391 100644 --- a/0008-hook-pass-correct-mount-dir-as-root-to-hook.patch +++ b/0008-hook-pass-correct-mount-dir-as-root-to-hook.patch @@ -1,7 +1,7 @@ From e8d9c6475eb42fdb1775a465353758f2c5418938 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Sat, 31 Oct 2020 17:38:04 +0800 -Subject: [PATCH 8/9] hook: pass correct mount dir as root to hook +Subject: [PATCH 08/10] hook: pass correct mount dir as root to hook Signed-off-by: lifeng68 --- diff --git a/0009-cgroup-refact-cgroup-manager-to-single-file.patch b/0009-cgroup-refact-cgroup-manager-to-single-file.patch index 9978c18670327ee16a36763c6c18c928ec8b954b..3ead31c603e8b5592983b52e9949a35a5b48ca62 100644 --- a/0009-cgroup-refact-cgroup-manager-to-single-file.patch +++ b/0009-cgroup-refact-cgroup-manager-to-single-file.patch @@ -1,7 +1,7 @@ From 4592fbcbd0be862cf37a3090f58a4491c430e71a Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Mon, 2 Nov 2020 16:53:19 +0800 -Subject: [PATCH 9/9] cgroup: refact cgroup manager to single file +Subject: [PATCH 09/10] cgroup: refact cgroup manager to single file Signed-off-by: lifeng68 --- diff --git a/0010-cgfsng-adjust-log-level-from-error-to-warn.patch b/0010-cgfsng-adjust-log-level-from-error-to-warn.patch new file mode 100644 index 0000000000000000000000000000000000000000..e0ca43c80dbcad86ede1fb7e81c096080eb6de06 --- /dev/null +++ b/0010-cgfsng-adjust-log-level-from-error-to-warn.patch @@ -0,0 +1,76 @@ +From 9fa92a4f8d0fd772a27e5c27d03b927c765c133c Mon Sep 17 00:00:00 2001 +From: lifeng68 +Date: Fri, 13 Nov 2020 14:11:07 +0800 +Subject: [PATCH 10/10] cgfsng: adjust log level from error to warn + +Signed-off-by: lifeng68 +--- + src/lxc/cgroups/cgfsng.c | 6 +++--- + src/lxc/cgroups/isulad_cgfsng.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index 9b9aaf6c3..3f81f5c41 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -654,7 +654,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, + * verify /sys/fs/cgroup/ in this field. + */ + if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0) +- return log_error(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); ++ return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); + + p += 15; + p2 = strchr(p, ' '); +@@ -3092,7 +3092,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg + + mountpoint = cg_hybrid_get_mountpoint(line); + if (!mountpoint) { +- ERROR("Failed parsing mountpoint from \"%s\"", line); ++ WARN("Failed parsing mountpoint from \"%s\"", line); + continue; + } + +@@ -3101,7 +3101,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg + else + base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC); + if (!base_cgroup) { +- ERROR("Failed to find current cgroup"); ++ WARN("Failed to find current cgroup"); + continue; + } + +diff --git a/src/lxc/cgroups/isulad_cgfsng.c b/src/lxc/cgroups/isulad_cgfsng.c +index 82a4333f3..e16f8a198 100644 +--- a/src/lxc/cgroups/isulad_cgfsng.c ++++ b/src/lxc/cgroups/isulad_cgfsng.c +@@ -317,7 +317,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line, + * verify /sys/fs/cgroup/ in this field. + */ + if (strncmp(p, DEFAULT_CGROUP_MOUNTPOINT "/", 15) != 0) +- return log_error(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); ++ return log_warn(NULL, "Found hierarchy not under " DEFAULT_CGROUP_MOUNTPOINT ": \"%s\"", p); + + p += 15; + p2 = strchr(p, ' '); +@@ -2847,7 +2847,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg + + mountpoint = cg_hybrid_get_mountpoint(line); + if (!mountpoint) { +- ERROR("Failed parsing mountpoint from \"%s\"", line); ++ WARN("Failed parsing mountpoint from \"%s\"", line); + continue; + } + +@@ -2856,7 +2856,7 @@ static int cg_hybrid_init(struct cgroup_ops *ops, bool relative, bool unprivileg + else + base_cgroup = cg_hybrid_get_current_cgroup(basecginfo, NULL, CGROUP2_SUPER_MAGIC); + if (!base_cgroup) { +- ERROR("Failed to find current cgroup"); ++ WARN("Failed to find current cgroup"); + continue; + } + +-- +2.25.1 + diff --git a/lxc.spec b/lxc.spec index 0485a04a1c5f04e6abaf560c2364e50fdd063ed6..98f1f6d1b280927d5418161f7774d53e25faf60c 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2020110301 +%global _release 2020111301 Name: lxc Version: 4.0.3 @@ -16,6 +16,7 @@ Patch9006: 0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch Patch9007: 0007-Using-string-type-instead-of-security_context_t-beca.patch Patch9008: 0008-hook-pass-correct-mount-dir-as-root-to-hook.patch Patch9009: 0009-cgroup-refact-cgroup-manager-to-single-file.patch +Patch9010: 0010-cgfsng-adjust-log-level-from-error-to-warn.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -187,6 +188,12 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Fri Nov 13 2020 lifeng - 4.0.3-2020111301 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: adjust log level from error to warn + * Tue Nov 3 2020 lifeng - 4.0.3-2020110301 - Type:enhancement - ID:NA diff --git a/series.conf b/series.conf index a49fe764cd3917199320817da4744113ef6365fb..3b06d26a9e8b6a46050c85375bf0b003f596ab38 100644 --- a/series.conf +++ b/series.conf @@ -5,3 +5,6 @@ 0005-solve-coredump-bug-caused-by-fstype-being-NULL-durin.patch 0006-SIGTERM-do-not-catch-signal-SIGTERM-in-lxc-monitor.patch 0007-Using-string-type-instead-of-security_context_t-beca.patch +0008-hook-pass-correct-mount-dir-as-root-to-hook.patch +0009-cgroup-refact-cgroup-manager-to-single-file.patch +0010-cgfsng-adjust-log-level-from-error-to-warn.patch