Merge 37fb4be391 into abf01a0eb7

Fixes unlocked read from logBuffer.LastTsNs that is racey. (#5536 )
2024-05-20 02:10:20 +02:00 · 2024-04-26 09:33:03 +08:00 · 2024-04-25 15:46:12 -07:00
1 changed files with 9 additions and 1 deletions
--- a/weed/util/log_buffer/log_read.go
+++ b/weed/util/log_buffer/log_read.go
@ -66,9 +66,17 @@ func (logBuffer *LogBuffer) LoopProcessLogData(readerName string, startPosition
 				isDone = true
 				return
 			}
+			logBuffer.RLock()
 			lastTsNs := logBuffer.LastTsNs
-			for lastTsNs == logBuffer.LastTsNs {
+			logBuffer.RUnlock()
+			loopTsNs := lastTsNs // make a copy
+
+			for lastTsNs == loopTsNs {
 				if waitForDataFn() {
+					// Update loopTsNs and loop again
+					logBuffer.RLock()
+					loopTsNs = logBuffer.LastTsNs
+					logBuffer.RUnlock()
 					continue
 				} else {
 					isDone = true
Author	SHA1	Message	Date
wyang	ae48b77b52	Merge `37fb4be391` into `abf01a0eb7`	2024-04-26 09:33:03 +08:00
M@	abf01a0eb7	Fixes unlocked read from logBuffer.LastTsNs that is racey. (#5536 )	2024-04-25 15:46:12 -07:00