From d5926299ffe89d2c8bcce377372fe4df22593a12 Mon Sep 17 00:00:00 2001 From: "ilya.kuksenok" Date: Thu, 16 Feb 2023 14:07:59 +0300 Subject: [PATCH] Add meminfo patch for CRI-1.25 support. --- .gitignore | 3 +++ 0023-add_memory_stats.patch | 40 +++++++++++++++++++++++++++++++++++++ lxc.spec | 19 ++++++++++++++++-- series.conf | 2 ++ 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 0023-add_memory_stats.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b32d58 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vscode +.idea +*.swp diff --git a/0023-add_memory_stats.patch b/0023-add_memory_stats.patch new file mode 100644 index 0000000..1303ae3 --- /dev/null +++ b/0023-add_memory_stats.patch @@ -0,0 +1,40 @@ +diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c +index 4b669bb..4d5672a 100644 +--- a/src/lxc/lxccontainer.c ++++ b/src/lxc/lxccontainer.c +@@ -6055,6 +6055,19 @@ static bool do_lxcapi_get_container_metrics(struct lxc_container *c, struct lxc + + metrics->cpu_use_user = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "user", 1); + metrics->cpu_use_sys = metrics_match_get_ull(c, cgroup_ops, "cpuacct.stat", "system", 1); ++ metrics->avaliable_bytes = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes")- ++ ( ++ metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1) + ++ metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1) + ++ metrics_match_get_ull(c, cgroup_ops, "memory.stat", "swap", 1) - ++ metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1) ++ ); ++ metrics->usage_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1) + ++ metrics_match_get_ull(c, cgroup_ops, "memory.stat", "cache", 1) + ++ metrics_match_get_ull(c, cgroup_ops, "memory.stat", "swap", 1); ++ metrics->rss_bytes = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "rss", 1); ++ metrics->page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgfault", 1); ++ metrics->major_page_faults = metrics_match_get_ull(c,cgroup_ops, "memory.stat", "pgmajfault", 1); + + // Try to read CFQ stats available on all CFQ enabled kernels first + metrics_get_blk_stats(c, cgroup_ops, "blkio.io_serviced_recursive", &metrics->io_serviced); +diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h +index 3680ade..459fe0a 100644 +--- a/src/lxc/lxccontainer.h ++++ b/src/lxc/lxccontainer.h +@@ -66,6 +66,11 @@ struct lxc_container_metrics { + struct lxc_blkio_metrics io_service_bytes; + struct lxc_blkio_metrics io_serviced; + /* Memory usage */ ++ uint64_t avaliable_bytes; ++ uint64_t usage_bytes; ++ uint64_t rss_bytes; ++ uint64_t page_faults; ++ uint64_t major_page_faults; + uint64_t mem_used; + uint64_t mem_limit; + /* Kernel Memory usage */ diff --git a/lxc.spec b/lxc.spec index 5c93d52..dd28ca2 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022102407 +%global _release 2022102408 Name: lxc Version: 4.0.3 @@ -30,6 +30,8 @@ Patch0019: 0019-add-lxc-attach-add-gids-option.patch Patch0020: 0020-add-sscanf-adapation-code-for-musl.patch Patch0021: 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch Patch0022: 0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch +Patch0023: 0023-add_memory_stats.patch + BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -145,7 +147,7 @@ rm -rf %{buildroot}%{_libdir}/liblxc.la rm -rf %{buildroot}%{_sbindir}/init.%{name}.static rm -rf %{buildroot}%{_sysconfdir}/default/%{name} %check -make check +%make_build check %post @@ -210,6 +212,19 @@ make check %endif %changelog + +* Fri Feb 16 2023 Ilya Kuksenok - 4.0.3-2022102409 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: add Memory stats required for CRI-1.25 iSulad update. + +* Mon Feb 13 2023 jiangxinyu - 4.0.3-2022102408 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:optimize test command + * Fri Jan 13 2023 wangrunze - 4.0.3-2022102407 - Type:bugfix - ID:NA diff --git a/series.conf b/series.conf index 1d8bad9..91cfc55 100644 --- a/series.conf +++ b/series.conf @@ -19,3 +19,5 @@ 0020-add-sscanf-adapation-code-for-musl.patch 0021-change-the-suffi-parameter-in-lxc-attach-help-output.patch 0022-fix-cve-CVE-2022-47952-log-leaks-root-information.patch +0023-add_memory_stats.patch + -- Gitee