inflight: correct delete functionality

scylladb · Sep 3, 2019 · 2c52433 · 2c52433
1 parent 91042f7
commit 2c52433
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/inflight/inflight.go b/inflight/inflight.go
@@ -62,10 +62,20 @@ type syncU64set struct {
 }
 
 func (s *syncU64set) Delete(v uint64) bool {
+	s.mu.RLock()
+	if !s.pks.Has(v) {
+		s.mu.RUnlock()
+		return false
+	}
+	s.mu.RUnlock()
 	s.mu.Lock()
-	_, found := s.pks.Pop2()
-	s.mu.Unlock()
-	return found
+	defer s.mu.Unlock()
+	if !s.pks.Has(v) {
+		// double check
+		return false
+	}
+	s.pks.Remove(v)
+	return true
 }
 
 func (s *syncU64set) AddIfNotPresent(v uint64) bool {