From 9b3bf5f49f85eefe2bd1e90d95d3bb357829fa5b Mon Sep 17 00:00:00 2001 From: Zhonghu Xu Date: Mon, 30 Sep 2024 16:57:27 +0800 Subject: [PATCH] update Signed-off-by: Zhonghu Xu --- pkg/bpf/bpf.go | 3 ++- pkg/bpf/bpf_test.go | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/bpf/bpf.go b/pkg/bpf/bpf.go index 3409a16e1..a474012cf 100644 --- a/pkg/bpf/bpf.go +++ b/pkg/bpf/bpf.go @@ -210,6 +210,7 @@ func NewVersionMap(config *options.BpfConfig) *ebpf.Map { return nil } + log.Infof("create version map path %s", versionPath) if err := os.MkdirAll(versionPath, syscall.S_IRUSR|syscall.S_IWUSR|syscall.S_IXUSR|syscall.S_IRGRP|syscall.S_IXGRP); err != nil && !os.IsExist(err) { log.Errorf("mkdir failed %v", err) @@ -223,7 +224,7 @@ func NewVersionMap(config *options.BpfConfig) *ebpf.Map { } storeVersionInfo(m) - log.Infof("kmesh start with Normal") + log.Infof("store kmesh version successfully") restart.SetStartType(restart.Normal) return m } diff --git a/pkg/bpf/bpf_test.go b/pkg/bpf/bpf_test.go index 8fa21a526..be1299d91 100644 --- a/pkg/bpf/bpf_test.go +++ b/pkg/bpf/bpf_test.go @@ -27,6 +27,7 @@ import ( "kmesh.net/kmesh/daemon/options" "kmesh.net/kmesh/pkg/bpf/restart" + "kmesh.net/kmesh/pkg/constants" ) func TestRestart(t *testing.T) { @@ -71,6 +72,10 @@ func runTestNormal(t *testing.T) { if err := bpfLoader.Start(); err != nil { assert.ErrorIsf(t, err, nil, "bpfLoader start failed %v", err) } + + versionPath := filepath.Join(config.BpfFsPath, constants.WorkloadVersionPath) + _, err := os.Stat(versionPath) + assert.NoError(t, err) assert.Equal(t, restart.Normal, restart.GetStartType(), "set kmesh start status failed") restart.SetExitType(restart.Normal) bpfLoader.Stop() @@ -87,9 +92,9 @@ func runTestRestart(t *testing.T) { assert.Equal(t, restart.Normal, restart.GetStartType(), "set kmesh start status failed") restart.SetExitType(restart.Restart) if config.AdsEnabled() { - versionPath = filepath.Join(config.BpfFsPath + "/bpf_kmesh/map/") + versionPath = filepath.Join(config.BpfFsPath, constants.VersionPath) } else if config.WdsEnabled() { - versionPath = filepath.Join(config.BpfFsPath + "/bpf_kmesh_workload/map/") + versionPath = filepath.Join(config.BpfFsPath, constants.WorkloadVersionPath) } _, err := os.Stat(versionPath) assert.NoError(t, err)