packages/sysmonitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!22 fix bug fd interface failed to open

Browse Source 
From: @han_hui_hui 
Reviewed-by: @dowzyx 
Signed-off-by: @dowzyx
This commit is contained in:
openeuler-ci-bot 2024-06-19 07:22:32 +00:00 committed by Gitee
commit e19f98d7df
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bugfix-fix-fd-path-failed-to-open.patch Normal file
View File

@ -0,0 +1,48 @@
From 9241d98bc5803d18b1e17bd3ba1b84e97207fab4 Mon Sep 17 00:00:00 2001
From: tenglei <tenglei@kylinos.cn>
Date: Thu, 11 Apr 2024 17:55:13 +0800
Subject: [PATCH] bugfix fix fd path failed to open
---
src/sys_event.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/sys_event.c b/src/sys_event.c
index 61701ec..dbdb9d0 100644
--- a/src/sys_event.c
+++ b/src/sys_event.c
@@ -544,15 +544,25 @@ static int chang_kernel_interface_value(void)
return -1;
}
- ret = set_value_to_file(buf, PROC_FDTHRESHOLD);
- if (ret == -1) {
- log_printf(LOG_ERR, "chang_kernel_interface_value: set_value_to_file failed");
+ if (access(PROC_FDTHRESHOLD, F_OK) == 0) {
+ ret = set_value_to_file(buf, PROC_FDTHRESHOLD);
+ if (ret == -1) {
+ log_printf(LOG_ERR, "chang_kernel_interface_value: set_value_to_file failed");
+ return -1;
+ }
+ } else {
+ log_printf(LOG_ERR, "fdthreshold function is not supported in the current system environment");
return -1;
}
- ret = set_value_to_file("1", RROC_FDENABLE);
- if (ret == -1) {
- log_printf(LOG_ERR, "chang_kernel_interface_value: set_value_to_file failed");
+ if (access(RROC_FDENABLE, F_OK) == 0) {
+ ret = set_value_to_file("1", RROC_FDENABLE);
+ if (ret == -1) {
+ log_printf(LOG_ERR, "chang_kernel_interface_value: set_value_to_file failed");
+ return -1;
+ }
+ } else {
+ log_printf(LOG_ERR, "fdenable function is not supported in the current system environment");
return -1;
}
--
2.27.0

9
sysmonitor-kmod.spec
View File

@ -7,7 +7,7 @@
%define kmod_name sysmonitor
%define rpmversion 1.3.2
%define releaseversion 1.2
%define releaseversion 1.3
Summary: System Monitor Daemon
Name: %{kmod_name}-kmod
Version: %{rpmversion}
@ -36,6 +36,7 @@ Requires: python3
Provides: sysmonitor
Patch1: bugfix-fix-signal-monitor-err.patch
Patch2: bugfix-fix-fd-path-failed-to-open.patch
%description
System Monitor Daemon
@ -170,6 +171,12 @@ systemctl daemon-reload 2>/dev/null 1>/dev/null
/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service
%changelog
* Wed Jun 19 2024 hanhuihui <hanhuihui5@huawei.com> - 1.3.2-1.3
- Type:bugfix
- CVE:NA
- SUG:restart
- DESC: fix bug fd interface failed to open
* Tue Nov 28 2023 xietangxin<xietangxin@huawei.com> - 1.3.2-1.2
- Type:bugfix
- CVE:NA