attempt to fix data race

rancher · Oct 18, 2023 · eebb5c7 · eebb5c7
1 parent 7abb0aa
commit eebb5c7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -31,7 +31,6 @@ var (
 	pluginGroupPrefix = "plugin"
 	NoRepeatInterval  = 3600 * time.Hour // arbitrarily long time to denote one-time sampling
 	logFs             afero.Fs
-	logFileName       = "opni-logs"
 	DefaultTimeFormat = "2006 Jan 02 15:04:05"
 	errKey            = "err"
 )
@@ -236,17 +235,25 @@ func (s *sampler) onDroppedHook(_ context.Context, r slog.Record) {
 }
 
 func ReadOnlyFile(clusterID string) afero.File {
-	f, err := logFs.OpenFile(logFileName+clusterID, os.O_RDONLY|os.O_CREATE, 0666)
+	f, err := logFs.OpenFile(clusterID, os.O_RDONLY|os.O_CREATE, 0666)
 	if err != nil {
 		panic(err)
 	}
 	return f
 }
 
 func WriteOnlyFile(clusterID string) afero.File {
-	f, err := logFs.OpenFile(logFileName+clusterID, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
+	f, err := logFs.OpenFile(clusterID, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0666)
 	if err != nil {
 		panic(err)
 	}
 	return f
 }
+
+func GetFileIfExists(clusterID string) afero.File {
+	f, err := logFs.Open(clusterID)
+	if err != nil {
+		return nil
+	}
+	return f
+}
diff --git a/pkg/logger/plugin_writer.go b/pkg/logger/plugin_writer.go
@@ -6,7 +6,6 @@ import (
 )
 
 var sharedPluginWriter = &pluginWriter{
-	w:  &DefaultWriter,
 	mu: &sync.Mutex{},
 }
 
@@ -15,10 +14,16 @@ type pluginWriter struct {
 	mu *sync.Mutex
 }
 
-func SetPluginWriter(agentId string) {
+func InitPluginWriter(agentId string) {
 	sharedPluginWriter.mu.Lock()
 	defer sharedPluginWriter.mu.Unlock()
-	f := WriteOnlyFile(agentId)
+	if sharedPluginWriter.w != nil {
+		return
+	}
+	f := GetFileIfExists(agentId)
+	if f == nil {
+		f = WriteOnlyFile(agentId)
+	}
 	fileWriter := f.(io.Writer)
 	sharedPluginWriter.w = &fileWriter
 }

diff --git a/plugins/alerting/pkg/agent/stream.go b/plugins/alerting/pkg/agent/stream.go
@@ -42,5 +42,5 @@ func (p *Plugin) configureLoggers(identityClient controlv1.IdentityClient) {
 	if err != nil {
 		p.lg.Error("error fetching node id", logger.Err(err))
 	}
-	logger.SetPluginWriter(id.GetId())
+	logger.InitPluginWriter(id.GetId())
 }
diff --git a/plugins/logging/pkg/agent/stream.go b/plugins/logging/pkg/agent/stream.go
@@ -37,5 +37,5 @@ func (p *Plugin) configureLoggers(cc grpc.ClientConnInterface) {
 	if err != nil {
 		p.logger.Error("error fetching node id", logger.Err(err))
 	}
-	logger.SetPluginWriter(id.GetId())
+	logger.InitPluginWriter(id.GetId())
 }
diff --git a/plugins/metrics/pkg/agent/stream.go b/plugins/metrics/pkg/agent/stream.go
@@ -50,5 +50,5 @@ func (p *Plugin) configureLoggers(identityClient controlv1.IdentityClient) {
 	if err != nil {
 		p.logger.Error("error fetching node id", logger.Err(err))
 	}
-	logger.SetPluginWriter(id.GetId())
+	logger.InitPluginWriter(id.GetId())
 }
diff --git a/plugins/topology/pkg/topology/agent/stream.go b/plugins/topology/pkg/topology/agent/stream.go
@@ -36,5 +36,5 @@ func (p *Plugin) configureLoggers() {
 	if err != nil {
 		p.logger.Error("error fetching node id", logger.Err(err))
 	}
-	logger.SetPluginWriter(id.GetId())
+	logger.InitPluginWriter(id.GetId())
 }