From 36b5fd0ac27e570a07d4e6a45063d32256d75c15 Mon Sep 17 00:00:00 2001 From: znzjugod Date: Thu, 10 Oct 2024 12:15:59 +0800 Subject: [PATCH] modify iodump threhold from 1000 to 1000000000 and fix iodump in right turn --- ebpf-fix-alarm-bug.patch | 40 ++++++++++++++++++++++++++++++++++++++++ sysSentry.spec | 9 ++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 ebpf-fix-alarm-bug.patch diff --git a/ebpf-fix-alarm-bug.patch b/ebpf-fix-alarm-bug.patch new file mode 100644 index 0000000..d67a6a6 --- /dev/null +++ b/ebpf-fix-alarm-bug.patch @@ -0,0 +1,40 @@ +From 4077ea1871abe7c52319b76b199dd1b0c0e0f069 Mon Sep 17 00:00:00 2001 +From: zhangnan +Date: Thu, 10 Oct 2024 12:27:06 +0800 +Subject: [PATCH] ebpf fix alarm bug + +--- + src/c/ebpf_collector/ebpf_collector.h | 2 +- + src/python/sentryCollector/collect_io.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/c/ebpf_collector/ebpf_collector.h b/src/c/ebpf_collector/ebpf_collector.h +index 1ae33de..dca04d8 100644 +--- a/src/c/ebpf_collector/ebpf_collector.h ++++ b/src/c/ebpf_collector/ebpf_collector.h +@@ -11,7 +11,7 @@ typedef long long unsigned int u64; + typedef unsigned int u32; + + #define MAX_BUCKETS 1 +-#define THRESHOLD 1000 ++#define THRESHOLD 1000000000 + #define DURATION_THRESHOLD 500000000 + + #define RWBS_LEN 8 +diff --git a/src/python/sentryCollector/collect_io.py b/src/python/sentryCollector/collect_io.py +index 9d61f60..ba94b9d 100644 +--- a/src/python/sentryCollector/collect_io.py ++++ b/src/python/sentryCollector/collect_io.py +@@ -309,7 +309,8 @@ class CollectIo(): + curr_iops = self.get_ebpf_iops(curr_finish_count=curr_finish_count, prev_finish_count=prev_finish_count) + curr_io_length = self.get_ebpf_io_length(curr_latency=curr_latency, prev_latency=prev_latency) + curr_io_dump = self.get_ebpf_io_dump(curr_io_dump_count=curr_io_dump_count, prev_io_dump_count=prev_io_dump_count) +- IO_GLOBAL_DATA[disk_name][stage][io_type].insert(0, [curr_lat, curr_iops, curr_io_length, curr_io_dump]) ++ IO_GLOBAL_DATA[disk_name][stage][io_type].insert(0, [curr_lat, curr_io_dump, curr_io_length, curr_iops]) ++ logging.debug(f"ebpf collect data : {IO_GLOBAL_DATA}") + elapsed_time = time.time() - start_time + sleep_time = self.period_time - elapsed_time + if sleep_time < 0: +-- +2.33.0 + diff --git a/sysSentry.spec b/sysSentry.spec index 1d58ab0..502f0b6 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 27 +Release: 28 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -39,6 +39,7 @@ Patch26: ebpf-update-log.patch Patch27: change-alarm-length.patch Patch28: add-detail-time.patch Patch29: fix-config-relative-some-issues.patch +Patch30: ebpf-fix-alarm-bug.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -291,6 +292,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/sentryPlugins/ai_block_io %changelog +* Thu Oct 10 2024 zhangnan - 1.0.2-28 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:modify iodump threhold from 1000 to 1000000000 and fix iodump in right turn + * Wed Oct 9 2024 heyouzhi - 1.0.2-27 - Type:bugfix - CVE:NA -- Gitee