From 5dcd5c82ef47fa121e9800835fc399d5ecdc3af3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 3 Mar 2013 13:39:57 -0400
Subject: assistant: Prevent automatic commits from causing git-gc runs, as
 that can make things quite slow. Instead, git-gc --auto is run once a day.
 (This can be disabled by the usual gc.auto=0 setting.)

---
 Assistant/Threads/Committer.hs     | 3 ++-
 Assistant/Threads/SanityChecker.hs | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'Assistant')

diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 99d01b580..75976ee3c 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -82,7 +82,8 @@ commitStaged = do
 		Right _ -> do
 			direct <- isDirect
 			let params = nomessage $ catMaybes
-				[ Just $ Param "commit"
+				[ Just $ Param "-c", Just $ Param "gc.auto=0"
+				, Just $ Param "commit"
 				, Just $ Param "--quiet"
 				{- In indirect mode, avoid running the
 				 - usual git-annex pre-commit hook;
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs
index 0a1b15699..806441058 100644
--- a/Assistant/Threads/SanityChecker.hs
+++ b/Assistant/Threads/SanityChecker.hs
@@ -14,6 +14,7 @@ import Assistant.Common
 import Assistant.DaemonStatus
 import Assistant.Alert
 import qualified Git.LsFiles
+import qualified Git.Command
 import Utility.ThreadScheduler
 import qualified Assistant.Threads.Watcher as Watcher
 import Utility.LogFile
@@ -71,6 +72,7 @@ waitForNextCheck = do
 dailyCheck :: Assistant Bool
 dailyCheck = do
 	g <- liftAnnex gitRepo
+
 	-- Find old unstaged symlinks, and add them to git.
 	(unstaged, cleanup) <- liftIO $ Git.LsFiles.notInRepo False ["."] g
 	now <- liftIO $ getPOSIXTime
@@ -81,6 +83,11 @@ dailyCheck = do
 				| isSymbolicLink s -> addsymlink file ms
 			_ -> noop
 	liftIO $ void cleanup
+
+	{- Allow git-gc to run once per day. More frequent gc is avoided
+	 - to avoid slowing things down. -}
+	void $ liftIO $ Git.Command.runBool [Param "gc", Param "--auto"] g
+
 	return True
   where
 	toonew timestamp now = now < (realToFrac (timestamp + slop) :: POSIXTime)
-- 
cgit v1.2.3