diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..2e35ae4afdc97cf2fa75480cec79024934f830eb --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.swp +.vscode +.idea diff --git a/0025-meminfo-cri-1.25.patch b/0025-meminfo-cri-1.25.patch new file mode 100644 index 0000000000000000000000000000000000000000..3bf1e958fb2139720b3dace9149a12eb0123a498 --- /dev/null +++ b/0025-meminfo-cri-1.25.patch @@ -0,0 +1,41 @@ +diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c +index 4b669bb..387dc8c 100644 +--- a/src/lxc/lxccontainer.c ++++ b/src/lxc/lxccontainer.c +@@ -6052,7 +6052,19 @@ static bool do_lxcapi_get_container_metrics(struct lxc_container *c, struct lxc + + metrics->cpu_use_nanos = metrics_get_ull(c, cgroup_ops, "cpuacct.usage"); + metrics->pids_current = metrics_get_ull(c, cgroup_ops, "pids.current"); +- ++ uint64_t usage_bytes; ++ uint64_t workingset; ++ 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); ++ // workingset = usage - inactive_file ++ workingset = usage_bytes - metrics_match_get_ull(c, cgroup_ops, "memory.stat", "total_inactive_file", 1); ++ // Avaliable bytes = limit - workingset ++ metrics->avaliable_bytes = metrics_get_ull(c, cgroup_ops, "memory.limit_in_bytes") - workingset; ++ metrics->usage_bytes = usage_bytes; ++ 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); + 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); + +diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h +index 3680ade..371b313 100644 +--- a/src/lxc/lxccontainer.h ++++ b/src/lxc/lxccontainer.h +@@ -68,6 +68,11 @@ struct lxc_container_metrics { + /* Memory usage */ + uint64_t mem_used; + uint64_t mem_limit; ++ uint64_t avaliable_bytes; ++ uint64_t usage_bytes; ++ uint64_t rss_bytes; ++ uint64_t page_faults; ++ uint64_t major_page_faults; + /* Kernel Memory usage */ + uint64_t kmem_used; + uint64_t kmem_limit; diff --git a/lxc.spec b/lxc.spec index 339bd886c3a80c85adb931ad40217e5f986978cb..900a7fb987fb33ae441eab8ee81c27285d57d07e 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 2022102410 +%global _release 2022102411 Name: lxc Version: 4.0.3 @@ -32,6 +32,7 @@ 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-fix-lxc-write-error-message.patch Patch0024: 0024-remove-process-inheritable-capability.patch +Patch0025: 0025-meminfo-cri-1.25.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -212,6 +213,12 @@ rm -rf %{buildroot}%{_sysconfdir}/default/%{name} %endif %changelog +* Fri Feb 17 2023 ilya - 4.0.3-2022102411 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Add meminfo for CRI-1.25 + * Fri Feb 17 2023 zhangxiaoyu - 4.0.3-2022102410 - Type:bugfix - ID:NA diff --git a/series.conf b/series.conf new file mode 100644 index 0000000000000000000000000000000000000000..227a9cba6ec03c5d0db19f694ddc7391d9c2a75c --- /dev/null +++ b/series.conf @@ -0,0 +1,24 @@ +0001-refactor-patch-code-of-utils-commands-and-so-on.patch +0002-refactor-patch-code-of-isulad-for-conf-exec-attach.patch +0003-refactor-patch-code-of-isulad-for-selinux-attach.patch +0004-refactor-patch-code-of-lxccontianer-and-so-on.patch +0005-refactor-patch-code-of-attach-and-seccomp.patch +0006-refactor-patch-about-namespace-log-terminal.patch +0007-refactor-patches-on-terminal.c-start.c-and-so-on.patch +0008-refactor-patch-code-of-json.patch +0009-fix-HOME-env-of-container-unset-error.patch +0010-check-yajl-only-when-have-isulad.patch +0011-drop-security_context_t.patch +0012-only-set-user-or-image-set-non-empty-HOME.patch +0013-return-fail-if-no-args-or-no-rootfs-path-found.patch +0014-fix-tools-using-option-give-error-message.patch +0015-fix-do-mask-pathes-after-parent-mounted.patch +0017-lxc-Add-sw64-architecture.patch +0018-add-macro-to-adapt-musl-libc.patch +0019-add-lxc-attach-add-gids-option.patch +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-fix-lxc-write-error-message.patch +0024-remove-process-inheritable-capability.patch +0025-meminfo-cri-1.25.patch