diff --git a/0005-fix-get-kmesh-daemon-help-failed-when-kmesh.service-.patch b/0005-fix-get-kmesh-daemon-help-failed-when-kmesh.service-.patch new file mode 100644 index 0000000000000000000000000000000000000000..df606fca320441a211fb57553adaca1def44d366 --- /dev/null +++ b/0005-fix-get-kmesh-daemon-help-failed-when-kmesh.service-.patch @@ -0,0 +1,43 @@ +From f1ea65336bdf27437e1e12d73e149672d49472c1 Mon Sep 17 00:00:00 2001 +From: JofDiamonds +Date: Mon, 20 Mar 2023 14:29:13 +0800 +Subject: [PATCH] fix get kmesh-daemon help failed when kmesh.service start + +--- + daemon/manager/manager.go | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/daemon/manager/manager.go b/daemon/manager/manager.go +index 02c18fd..ab3f773 100644 +--- a/daemon/manager/manager.go ++++ b/daemon/manager/manager.go +@@ -43,12 +43,7 @@ var ( + + // Execute start daemon manager process + func Execute() { +- err := pid.CreatePidFile() +- if err != nil { +- log.Errorf("failed to start, reason: %v", err) +- return +- } +- defer pid.RemovePidFile() ++ var err error + + if err = options.InitDaemonConfig(); err != nil { + log.Error(err) +@@ -56,6 +51,12 @@ func Execute() { + } + log.Info("options InitDaemonConfig successful") + ++ if err = pid.CreatePidFile(); err != nil { ++ log.Errorf("failed to start, reason: %v", err) ++ return ++ } ++ defer pid.RemovePidFile() ++ + if err = bpf.Start(); err != nil { + fmt.Println(err) + return +-- +2.33.0 + diff --git a/Kmesh.spec b/Kmesh.spec index c68808f869bd58a9f83c0ff4382ac1c946d8e0ea..58d6ba42ad0465d081275cff42c1ff324de4c364 100644 --- a/Kmesh.spec +++ b/Kmesh.spec @@ -2,7 +2,7 @@ Name: Kmesh Version: 0.2.0 -Release: 5 +Release: 6 Summary: %{name} is a eBPF-based service mesh kernel solution License: ASL 2.0 URL: https://gitee.com/openeuler/%{name} @@ -24,6 +24,7 @@ Patch0001: 0001-fix-makefile-not-found-pc-file.patch Patch0002: 0002-fix-ubuf-not-use-sockops-and-tcp-state.patch Patch0003: 0003-Kmesh-fix-node-clean-failed-in-rb-tree.patch Patch0004: 0004-modify-license.patch +Patch0005: 0005-fix-get-kmesh-daemon-help-failed-when-kmesh.service-.patch %description %{name} is a eBPF-based service mesh kernel solution. @@ -104,6 +105,9 @@ rm -rf %{buildroot} %attr(0550,root,root) /usr/bin/kmesh-stop-post.sh %changelog +* Mon Mar 20 2023 JofDiamonds - 0.2.0-6 +- fix get kmesh-daemon help failed when kmesh.service start + * Mon Mar 13 2023 JofDiamonds - 0.2.0-5 - modify kmesh license to ASL 2.0