cshared: Make non-blocking for checking existence of the channel

Without using Mutex.TryLock(), this golang interface causes the main fluent-bit process stuck on pause. This shouldn't be desired behavior. Signed-off-by: Hiroshi Hatake <[email protected]>
chronosphereio · Oct 12, 2023 · ac82d67 · ac82d67
1 parent 509eb21
commit ac82d67
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/cshared.go b/cshared.go
@@ -92,7 +92,9 @@ func cleanup() int {
 		runCancel = nil
 	}
 
-	theInputLock.Lock()
+	if !theInputLock.TryLock() {
+		return input.FLB_OK
+	}
 	defer theInputLock.Unlock()
 
 	if theChannel != nil {
@@ -258,7 +260,9 @@ func FLBPluginInputPause() {
 		runCancel = nil
 	}
 
-	theInputLock.Lock()
+	if !theInputLock.TryLock() {
+		return
+	}
 	defer theInputLock.Unlock()
 
 	if theChannel != nil {
@@ -290,7 +294,9 @@ func FLBPluginOutputPreExit() {
 		runCancel = nil
 	}
 
-	theInputLock.Lock()
+	if !theInputLock.TryLock() {
+		return
+	}
 	defer theInputLock.Unlock()
 
 	if theChannel != nil {