From ed9e6d28b11a71dfde1219d343fdc7eca0d06624 Mon Sep 17 00:00:00 2001
From: Manish R Jain <manishrjain@gmail.com>
Date: Thu, 3 Mar 2016 18:43:39 +1100
Subject: [PATCH] It's faster to let the aggressiveMerge run, than to run
 gentle merge.

---
 posting/lists.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/posting/lists.go b/posting/lists.go
index 260a34c0..4d09e144 100644
--- a/posting/lists.go
+++ b/posting/lists.go
@@ -182,7 +182,9 @@ func checkMemoryUsage() {
 		} else {
 			// If merging is slow, we don't want to end up having too many goroutines
 			// merging the dirty list. This should keep them in check.
-			if mr.Count() > 25 {
+			// With a value of 12 and duration of 5 seconds, some goroutines are
+			// taking over a minute to finish.
+			if mr.Count() > 12 {
 				glog.Info("Skipping gentle merging.")
 				continue
 			}
-- 
GitLab