fix: ring buffer deadlock

canonical · Oct 15, 2024 · c68f72c · c68f72c
1 parent 9cb6317
commit c68f72c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/internals/servicelog/iterator.go b/internals/servicelog/iterator.go
@@ -69,6 +69,8 @@ func (it *iterator) Close() error {
 	if it.rb == nil {
 		return nil
 	}
+	it.rb.iteratorMutex.Lock()
+	defer it.rb.iteratorMutex.Unlock()
 	it.rb.removeIterator(it)
 	close(it.nextChan)
 	it.rb = nil

diff --git a/internals/servicelog/ringbuffer.go b/internals/servicelog/ringbuffer.go
@@ -92,6 +92,8 @@ func (rb *RingBuffer) Write(p []byte) (written int, err error) {
 	}
 	defer func() {
 		if written > 0 {
+			rb.iteratorMutex.RLock()
+			defer rb.iteratorMutex.RUnlock()
 			rb.signalIterators()
 		}
 	}()
@@ -336,8 +338,6 @@ func (rb *RingBuffer) discard(n int) error {
 }
 
 func (rb *RingBuffer) signalIterators() {
-	rb.iteratorMutex.RLock()
-	defer rb.iteratorMutex.RUnlock()
 	for _, iter := range rb.iteratorList {
 		select {
 		case iter.nextChan <- true:
@@ -365,8 +365,6 @@ func (rb *RingBuffer) releaseIterators() {
 }
 
 func (rb *RingBuffer) removeIterator(iter *iterator) {
-	rb.iteratorMutex.Lock()
-	defer rb.iteratorMutex.Unlock()
 	for i, storedIter := range rb.iteratorList {
 		if iter != storedIter {
 			continue