feat: fix rollback mitigation #close

Trendyol · Oct 31, 2023 · cd5b538 · cd5b538
1 parent f06eae1
commit cd5b538
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/couchbase/rollback_mitigation.go b/couchbase/rollback_mitigation.go
@@ -356,6 +356,11 @@ func (r *rollbackMitigation) Start() {
 
 func (r *rollbackMitigation) Stop() {
 	r.closed = true
+	if r.observeTimer != nil {
+		r.observeTimer.Stop()
+		r.observeCloseCh <- struct{}{}
+		<-r.observeCloseDoneCh
+	}
 	r.configWatchTimer.Stop()
 
 	logger.Log.Info("rollback mitigation stopped")

diff --git a/wrapper/concurrent_swiss_map.go b/wrapper/concurrent_swiss_map.go
@@ -43,7 +43,7 @@ func (m *ConcurrentSwissMap[K, V]) ToMap() map[K]V {
 	result := make(map[K]V)
 	m.Range(func(key K, value V) bool {
 		result[key] = value
-		return false
+		return true
 	})
 	return result
 }