fix: fix logic

Bisonai · Aug 2, 2024 · 7285fb7 · 7285fb7
1 parent c8a25d2
commit 7285fb7
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/node/pkg/dal/collector/collector.go b/node/pkg/dal/collector/collector.go
@@ -156,24 +156,16 @@ func (c *Collector) receiveEach(ctx context.Context, configId int32) error {
 }
 
 func (c *Collector) compareAndSwapLatestTimestamp(data aggregator.SubmissionData) bool {
-	c.mu.RLock()
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
 	old, ok := c.LatestTimestamps[data.GlobalAggregate.ConfigID]
-	c.mu.RUnlock()
-	if !ok {
-		c.mu.Lock()
+	if !ok || !old.After(data.GlobalAggregate.Timestamp) {
 		c.LatestTimestamps[data.GlobalAggregate.ConfigID] = data.GlobalAggregate.Timestamp
-		c.mu.Unlock()
 		return true
 	}
 
-	if old.After(data.GlobalAggregate.Timestamp) {
-		return false
-	}
-
-	c.mu.Lock()
-	c.LatestTimestamps[data.GlobalAggregate.ConfigID] = data.GlobalAggregate.Timestamp
-	c.mu.Unlock()
-	return true
+	return false
 }
 
 func (c *Collector) processIncomingData(ctx context.Context, data aggregator.SubmissionData) {