Bug fix.

Author: xOS

db/model_ops.go

@@ -399,21 +399,34 @@ func (o *MonitorHistoryOps) CleanupOldMonitorHistories(maxAge time.Duration) (in
 		return 0, nil
 	}
 
-	// Batch delete in one write transaction to reduce lock and txn overhead.
-	o.db.rwMutex.Lock()
-	defer o.db.rwMutex.Unlock()
-	if err := o.db.db.Update(func(txn *badger.Txn) error {
-		for _, key := range keysToDelete {
-			if delErr := txn.Delete([]byte(key)); delErr != nil {
-				return delErr
+	// Delete in bounded transactions to avoid Badger's ErrTxnTooBig.
+	const deleteBatchSize = 1000
+	deleted := 0
+	for start := 0; start < len(keysToDelete); start += deleteBatchSize {
+		end := start + deleteBatchSize
+		if end > len(keysToDelete) {
+			end = len(keysToDelete)
+		}
+
+		batch := keysToDelete[start:end]
+		o.db.rwMutex.Lock()
+		err := o.db.db.Update(func(txn *badger.Txn) error {
+			for _, key := range batch {
+				if delErr := txn.Delete([]byte(key)); delErr != nil {
+					return delErr
+				}
 			}
+			return nil
+		})
+		o.db.rwMutex.Unlock()
+		if err != nil {
+			return deleted, err
 		}
-		return nil
-	}); err != nil {
-		return 0, err
+
+		deleted += len(batch)
 	}
 
-	return len(keysToDelete), nil
+	return deleted, nil
 }
 
 // UserOps provides specialized operations for users

pkg/geoip/geoip.db

@@ -1 +0,0 @@
-stub