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

sync fix gazellectl lstack show ip -r with ltran error && log info display unknow error

Browse Source 
(cherry picked from commit a0c53ac0fd17447512ffc7b65e962689c4f54bac)
This commit is contained in:
yinbin 2023-12-18 11:06:28 +08:00 committed by openeuler-sync-bot
parent 7c2cf03596
commit bd4af96b38
3 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0087-mod-time-err.patch Normal file
View File

@ -0,0 +1,25 @@
From 1d578011ed2ee7e508af119d963e7283b1d0dc6f Mon Sep 17 00:00:00 2001
From: hantwofish <hankangkang5@huawei.com>
Date: Mon, 18 Dec 2023 09:52:21 +0800
Subject: [PATCH] mod time err
---
src/ltran/ltran_dfx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 25d4f35..c8dc562 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -1018,7 +1018,7 @@ static void gazelle_localtime_string(char* str, int buff_len)
time_t t = time.tv_sec;
tm = localtime(&t);
int ret = sprintf_s(str, buff_len, "%d-%d-%d %d:%d:%d",
- tm->tm_yday + 1900, tm->tm_mon + 1, tm->tm_yday, tm->tm_hour, tm->tm_min, tm->tm_sec);
+ tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
if (ret < 0) {
printf("gazelle_localtime_string sprintf_s fail ret=%d\n", ret);
return;
--
2.27.0

39
0088-fix-gazellectl-lstack-show-ip-r-with-ltran-error-log.patch Normal file
View File

@ -0,0 +1,39 @@
From 24b45463b653cf2aa204ca3ff303f8fe848d416f Mon Sep 17 00:00:00 2001
From: yinbin <yinbin8@huawei.com>
Date: Sat, 16 Dec 2023 20:21:21 +0800
Subject: [PATCH] fix gazellectl lstack show ip -r with ltran error && log info
display unknow error
---
src/lstack/core/lstack_stack_stat.c | 1 +
src/ltran/ltran_dfx.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lstack/core/lstack_stack_stat.c b/src/lstack/core/lstack_stack_stat.c
index e4ccc41..23571b4 100644
--- a/src/lstack/core/lstack_stack_stat.c
+++ b/src/lstack/core/lstack_stack_stat.c
@@ -201,6 +201,7 @@ static void get_stack_dfx_data(struct gazelle_stack_dfx_data *dfx, struct protoc
switch (stat_mode) {
case GAZELLE_STAT_LSTACK_SHOW:
case GAZELLE_STAT_LSTACK_SHOW_RATE:
+ case GAZELLE_STAT_LTRAN_SHOW_LSTACK:
get_stack_stats(dfx, stack);
/* fall through */
case GAZELLE_STAT_LSTACK_SHOW_AGGREGATE:
diff --git a/src/ltran/ltran_dfx.c b/src/ltran/ltran_dfx.c
index 25d4f35..5291fe0 100644
--- a/src/ltran/ltran_dfx.c
+++ b/src/ltran/ltran_dfx.c
@@ -99,7 +99,7 @@ static void gazelle_print_lstack_nic_features(void *buf, const struct gazelle_st
static struct gazelle_dfx_list g_gazelle_dfx_tbl[] = {
{GAZELLE_STAT_LTRAN_SHOW, sizeof(struct gazelle_stat_ltran_total), gazelle_print_ltran_stat_total},
{GAZELLE_STAT_LTRAN_SHOW_RATE, sizeof(struct gazelle_stat_ltran_total), gazelle_print_ltran_stat_rate},
- {GAZELLE_STAT_LTRAN_SHOW_LB_RATE, sizeof(struct gazelle_stat_ltran_total), gazelle_print_ltran_stat_lb_rate},
+ {GAZELLE_STAT_LTRAN_SHOW_LB_RATE, sizeof(struct gazelle_stat_lstack_total), gazelle_print_ltran_stat_lb_rate},
{GAZELLE_STAT_LTRAN_SHOW_INSTANCE, sizeof(struct gazelle_stat_ltran_client), gazelle_print_ltran_stat_client},
{GAZELLE_STAT_LTRAN_SHOW_BURST, sizeof(struct gazelle_stat_ltran_total), gazelle_print_ltran_stat_burst},
{GAZELLE_STAT_LTRAN_SHOW_LATENCY, sizeof(struct in_addr), gazelle_print_ltran_stat_latency},
--
2.27.0

8
gazelle.spec
View File

@ -2,7 +2,7 @@
Name: gazelle
Version: 1.0.2
Release: 19
Release: 20
Summary: gazelle is a high performance user-mode stack
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/gazelle
@ -100,6 +100,8 @@ Patch9083: 0083-fix-close-can-t-exit.patch
Patch9084: 0084-mod-unix-time-stamp-to-local-time.patch
Patch9085: 0085-optimize-gazelle-exit-process.patch
Patch9086: 0086-fix-EPOLLIN-event-error.patch
Patch9087: 0087-mod-time-err.patch
Patch9088: 0088-fix-gazellectl-lstack-show-ip-r-with-ltran-error-log.patch
%description
%{name} is a high performance user-mode stack.
@ -141,6 +143,10 @@ install -Dpm 0640 %{_builddir}/%{name}-%{version}/src/ltran/ltran.conf %{b
%config(noreplace) %{conf_path}/ltran.conf
%changelog
* Mon Dec 18 2023 yinbin6 <yinbin8@huawei.com> - 1.0.2-20
- fix gazellectl lstack show ip -r with ltran error && log info display unknow error
- mod time err
* Sat Dec 16 2023 yinbin6 <yinbin8@huawei.com> - 1.0.2-19
- fix EPOLLIN event error
- optimize gazelle exit process 1. close all fds 2. lstack thread exits, then gazelle process exits