Added lock protection for data race

Signed-off-by: LiZhenCheng9527 <[email protected]>

ctl/accesslog/accesslog.go

@@ -48,9 +48,14 @@ kmeshctl accesslog <kmesh-daemon-pod> enable`,
 }
 
 func SetAccesslog(cmd *cobra.Command, args []string) {
+	var info string
 	podName := args[0]
 	accesslogFlag := args[1]
-	if accesslogFlag != "enable" && accesslogFlag != "disable" {
+	if accesslogFlag == "enable" {
+		info = "true"
+	} else if accesslogFlag == "disable" {
+		info = "false"
+	} else {
 		log.Errorf("Error: Argument must be 'enable' or 'disable'")
 		os.Exit(1)
 	}
@@ -66,7 +71,7 @@ func SetAccesslog(cmd *cobra.Command, args []string) {
 	}
 	defer fw.Close()
 
-	url := fmt.Sprintf("http://%s%s?enable=%s", fw.Address(), patternAccesslog, accesslogFlag)
+	url := fmt.Sprintf("http://%s%s?enable=%s", fw.Address(), patternAccesslog, info)
 
 	req, err := http.NewRequest(http.MethodPost, url, nil)
 	if err != nil {

pkg/controller/telemetry/metric.go

@@ -50,13 +50,18 @@ const (
 var osStartTime time.Time
 
 type MetricController struct {
-	EnableAccesslog     bool
+	EnableAccesslog     enableTrigger
 	workloadCache       cache.WorkloadCache
 	workloadMetricCache map[workloadMetricLabels]*workloadMetricInfo
 	serviceMetricCache  map[serviceMetricLabels]*serviceMetricInfo
 	mutex               sync.RWMutex
 }
 
+type enableTrigger struct {
+	mutex            sync.RWMutex
+	accesslogTrigger bool
+}
+
 type workloadMetricInfo struct {
 	WorkloadConnOpened        float64
 	WorkloadConnClosed        float64
@@ -176,13 +181,23 @@ type serviceMetricLabels struct {
 
 func NewMetric(workloadCache cache.WorkloadCache, enableAccesslog bool) *MetricController {
 	return &MetricController{
-		EnableAccesslog:     enableAccesslog,
+		EnableAccesslog:     NewEnabelTrigger(enableAccesslog),
 		workloadCache:       workloadCache,
 		workloadMetricCache: map[workloadMetricLabels]*workloadMetricInfo{},
 		serviceMetricCache:  map[serviceMetricLabels]*serviceMetricInfo{},
 	}
 }
 
+func NewEnabelTrigger(info bool) enableTrigger {
+	return enableTrigger{
+		accesslogTrigger: info,
+	}
+}
+
+func (t *enableTrigger) GetAccesslogTrigger() bool {
+	return t.accesslogTrigger
+}
+
 func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 	if m == nil {
 		return
@@ -262,7 +277,7 @@ func (m *MetricController) Run(ctx context.Context, mapOfTcpInfo *ebpf.Map) {
 				serviceLabels.reporter = "source"
 				accesslog.direction = "OUTBOUND"
 			}
-			if data.state == TCP_CLOSTED && accesslog.sourceWorkload != "-" && m.EnableAccesslog {
+			if data.state == TCP_CLOSTED && accesslog.sourceWorkload != "-" && m.EnableAccesslog.accesslogTrigger {
 				OutputAccesslog(data, accesslog)
 			}
 			m.mutex.Lock()
@@ -611,3 +626,9 @@ func restoreIPv4(bytes []byte) []byte {
 
 	return bytes[:4]
 }
+
+func (t *enableTrigger) SetAccesslogTrigger(info bool) {
+	t.mutex.Lock()
+	defer t.mutex.Unlock()
+	t.accesslogTrigger = info
+}

pkg/status/status_server.go

@@ -239,14 +239,19 @@ func (s *Server) loggersHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *Server) accesslogHandler(w http.ResponseWriter, r *http.Request) {
-	accesslogInfo := r.URL.Query().Get("enable")
+	if r.Method != http.MethodPost {
+		log.Errorf("accesslogHandler export POST method but get %v", r.Method)
+		return
+	}
 
-	if accesslogInfo == "enable" {
-		s.xdsClient.WorkloadController.MetricController.EnableAccesslog = true
+	var info bool
+	accesslogInfo := r.URL.Query().Get("enable")
+	if accesslogInfo == "true" {
+		info = true
 	} else {
-		s.xdsClient.WorkloadController.MetricController.EnableAccesslog = false
+		info = false
 	}
-
+	s.xdsClient.WorkloadController.MetricController.EnableAccesslog.SetAccesslogTrigger(info)
 	w.WriteHeader(http.StatusOK)
 }
 

pkg/status/status_server_test.go

@@ -488,9 +488,12 @@ func TestServer_dumpAdsBpfMap(t *testing.T) {
 func TestServer_accesslogHandler(t *testing.T) {
 	t.Run("change accesslog config info", func(t *testing.T) {
 		config := options.BpfConfig{
-			Mode:        "workload",
-			BpfFsPath:   "/sys/fs/bpf",
-			Cgroup2Path: "/mnt/kmesh_cgroup2",
+			Mode:            "workload",
+			BpfFsPath:       "/sys/fs/bpf",
+			Cgroup2Path:     "/mnt/kmesh_cgroup2",
+			EnableMda:       false,
+			EnableBpfLog:    false,
+			EnableAccesslog: true,
 		}
 		cleanup, _ := test.InitBpfMap(t, config)
 		defer cleanup()
@@ -499,17 +502,17 @@ func TestServer_accesslogHandler(t *testing.T) {
 			xdsClient: &controller.XdsClient{
 				WorkloadController: &workload.Controller{
 					MetricController: &telemetry.MetricController{
-						EnableAccesslog: false,
+						EnableAccesslog: telemetry.NewEnabelTrigger(true),
 					},
 				},
 			},
 		}
 
-		url := fmt.Sprintf("%s?enable=%s", patternAccesslog, "disable")
+		url := fmt.Sprintf("%s?enable=%s", patternAccesslog, "false")
 		req := httptest.NewRequest(http.MethodPost, url, nil)
 		w := httptest.NewRecorder()
 		server.accesslogHandler(w, req)
 
-		assert.Equal(t, server.xdsClient.WorkloadController.MetricController.EnableAccesslog, false)
+		assert.Equal(t, server.xdsClient.WorkloadController.MetricController.EnableAccesslog.GetAccesslogTrigger(), false)
 	})
 }