Merge pull request #860 from extole/delete-topic-not-thread-safe

bai · web-flow · commit c17500d555ac · 2026-04-28T14:00:11.000+03:00
Issue 730: inmemory deleteTopic is not thread-safe
diff --git a/core/internal/storage/inmemory.go b/core/internal/storage/inmemory.go
@@ -643,13 +643,15 @@ func (module *InMemoryStorage) deleteTopic(request *protocol.StorageRequest, req
 		return
 	}
 
+	clusterMap.consumerLock.RLock()
 	// Work backwards - remove the topic from consumer groups first
 	for _, consumerMap := range clusterMap.consumer {
 		consumerMap.lock.Lock()
 		// No need to check for existence
 		delete(consumerMap.topics, request.Topic)
 		consumerMap.lock.Unlock()
 	}
+	clusterMap.consumerLock.RUnlock()
 
 	// Now remove the topic from the broker list
 	clusterMap.brokerLock.Lock()

Original file line number	Diff line number	Diff line change
`@@ -643,13 +643,15 @@ func (module InMemoryStorage) deleteTopic(request protocol.StorageRequest, req`
`643`	`643`	`return`
`644`	`644`	`}`
`645`	`645`
	`646`	`+ clusterMap.consumerLock.RLock()`
`646`	`647`	`// Work backwards - remove the topic from consumer groups first`
`647`	`648`	`for _, consumerMap := range clusterMap.consumer {`
`648`	`649`	`consumerMap.lock.Lock()`
`649`	`650`	`// No need to check for existence`
`650`	`651`	`delete(consumerMap.topics, request.Topic)`
`651`	`652`	`consumerMap.lock.Unlock()`
`652`	`653`	`}`
	`654`	`+ clusterMap.consumerLock.RUnlock()`
`653`	`655`
`654`	`656`	`// Now remove the topic from the broker list`
`655`	`657`	`clusterMap.brokerLock.Lock()`