From aae0936ef69b8533fb2577c27057a8c90eb58767 Mon Sep 17 00:00:00 2001
From: luckky <guodashun1@huawei.com>
Date: Thu, 13 Mar 2025 16:15:49 +0800
Subject: [PATCH] ai block io: exit when stage is not supported

(cherry picked from commit c6b8404ef4f8ee486d7f0120d225fadb0e51e778)
---
 ...-io-exit-when-stage-is-not-supported.patch | 69 +++++++++++++++++++
 sysSentry.spec                                |  9 ++-
 2 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 ai-block-io-exit-when-stage-is-not-supported.patch

diff --git a/ai-block-io-exit-when-stage-is-not-supported.patch b/ai-block-io-exit-when-stage-is-not-supported.patch
new file mode 100644
index 0000000..cdb7fed
--- /dev/null
+++ b/ai-block-io-exit-when-stage-is-not-supported.patch
@@ -0,0 +1,69 @@
+From b462c193e8b6bb7b8f252b9ef8931d91831e1321 Mon Sep 17 00:00:00 2001
+From: luckky <guodashun1@huawei.com>
+Date: Thu, 13 Mar 2025 11:55:15 +0800
+Subject: [PATCH] ai block io: exit when stage is not supported
+
+---
+ .../ai_block_io/config_parser.py              | 32 +++++++++++++++++--
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/src/sentryPlugins/ai_block_io/config_parser.py b/src/sentryPlugins/ai_block_io/config_parser.py
+index 1bbb609..612fe9f 100644
+--- a/src/sentryPlugins/ai_block_io/config_parser.py
++++ b/src/sentryPlugins/ai_block_io/config_parser.py
+@@ -32,6 +32,12 @@ ALL_STAGE_LIST = [
+     "rq_driver",
+     "bio",
+ ]
++EBPF_STAGE_LIST = [
++    "wbt",
++    "rq_driver",
++    "bio",
++    "gettag"
++]
+ ALL_IOTPYE_LIST = ["read", "write"]
+ DISK_TYPE_MAP = {
+     0: "nvme_ssd",
+@@ -312,15 +318,37 @@ class ConfigParser:
+         if len(stage_list) == 1 and stage_list[0] == "":
+             logging.critical("stage value not allow is empty, exiting...")
+             exit(1)
++
++        # check if kernel or ebpf is supported (code is from collector)
++        valid_stage_list = ALL_STAGE_LIST
++        base_path = '/sys/kernel/debug/block'
++        all_disk = []
++        for disk_name in os.listdir(base_path):
++            disk_path = os.path.join(base_path, disk_name)
++            blk_io_hierarchy_path = os.path.join(disk_path, 'blk_io_hierarchy')
++
++            if not os.path.exists(blk_io_hierarchy_path):
++                logging.warning("no blk_io_hierarchy directory found in %s, skipping.", disk_name)
++                continue
++
++            for file_name in os.listdir(blk_io_hierarchy_path):
++                if file_name == 'stats':
++                    all_disk.append(disk_name)
++        
++        if len(all_disk) == 0:
++            logging.debug("no blk_io_hierarchy disk, it is not lock-free collection")
++            valid_stage_list = EBPF_STAGE_LIST
++
+         if len(stage_list) == 1 and stage_list[0] == "default":
+             logging.warning(
+                 "stage will enable default value: %s",
+                 self.DEFAULT_CONF["common"]["stage"],
+             )
+-            self._conf["common"]["stage"] = ALL_STAGE_LIST
++            self._conf["common"]["stage"] = valid_stage_list
+             return
++
+         for stage in stage_list:
+-            if stage not in ALL_STAGE_LIST:
++            if stage not in valid_stage_list:
+                 logging.critical(
+                     "stage: %s is not valid stage, ai_block_io will exit...", stage
+                 )
+-- 
+2.43.0
+
diff --git a/sysSentry.spec b/sysSentry.spec
index ba9addc..b75f493 100644
--- a/sysSentry.spec
+++ b/sysSentry.spec
@@ -4,7 +4,7 @@
 Summary: System Inspection Framework
 Name: sysSentry
 Version: 1.0.3
-Release: 7
+Release: 8
 License: Mulan PSL v2
 Group: System Environment/Daemons
 Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Patch3:    add-log-for-xalarmd-and-fix-delete-on-iter-problem.patch
 Patch4:    fix-xalarm-log-not-print-and-add-on-iter-problem.patch
 Patch5:    add-new-func-for-ebpf-in-the-rq_driver-stage.patch
 Patch6:    fix-the-sentryCollector-service-can-t-be-stopped-for.patch
+Patch7:    ai-block-io-exit-when-stage-is-not-supported.patch
 
 BuildRequires: cmake gcc-c++
 BuildRequires: python3 python3-setuptools
@@ -211,6 +212,12 @@ rm -rf /var/run/sysSentry | :
 %attr(0550,root,root) %{python3_sitelib}/syssentry/bmc_alarm.py
 
 %changelog
+* Thu Mar 13 2025 luckky <guodashun1@huawei.com> - 1.0.3-8
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: fix an issue with printing error
+
 * Mon Feb 24 2025 zhuofeng <zhuofeng2@huawei.com> - 1.0.3-7
 - Type:bugfix
 - CVE:NA
-- 
Gitee