Make admin git gc/fsck tasks run in background

Author: zeripath

modules/repository/check.go

@@ -34,10 +34,10 @@ func GitFsck(ctx context.Context) error {
 			}
 			repo := bean.(*models.Repository)
 			repoPath := repo.RepoPath()
-			log.Trace("Running health check on repository %s", repoPath)
+			log.Trace("Running health check on repository %v", repo)
 			if err := git.Fsck(repoPath, setting.Cron.RepoHealthCheck.Timeout, setting.Cron.RepoHealthCheck.Args...); err != nil {
+				log.Warn("Failed to health check repository (%v): %v", repo, err)
 				desc := fmt.Sprintf("Failed to health check repository (%s): %v", repoPath, err)
-				log.Warn(desc)
 				if err = models.CreateRepositoryNotice(desc); err != nil {
 					log.Error("CreateRepositoryNotice: %v", err)
 				}
@@ -72,13 +72,18 @@ func GitGcRepos(ctx context.Context) error {
 			if err := repo.GetOwner(); err != nil {
 				return err
 			}
+			log.Trace("Running git gc on %v", repo)
 			if stdout, err := git.NewCommand(args...).
 				SetDescription(fmt.Sprintf("Repository Garbage Collection: %s", repo.FullName())).
 				RunInDirTimeout(
 					time.Duration(setting.Git.Timeout.GC)*time.Second,
 					repo.RepoPath()); err != nil {
 				log.Error("Repository garbage collection failed for %v. Stdout: %s\nError: %v", repo, stdout, err)
-				return fmt.Errorf("Repository garbage collection failed: Error: %v", err)
+				desc := fmt.Sprintf("Repository garbage collection failed for %s. Stdout: %s\nError: %v", repo.RepoPath(), stdout, err)
+				if err = models.CreateRepositoryNotice(desc); err != nil {
+					log.Error("CreateRepositoryNotice: %v", err)
+				}
+				return fmt.Errorf("Repository garbage collection failed in repo: %s: Error: %v", repo.FullName(), err)
 			}
 			return nil
 		},

options/locale/locale_en-US.ini

@@ -1759,7 +1759,7 @@ dashboard.delete_missing_repos_success = All repositories missing their Git file
 dashboard.delete_generated_repository_avatars = Delete generated repository avatars
 dashboard.delete_generated_repository_avatars_success = Generated repository avatars were deleted.
 dashboard.git_gc_repos = Garbage collect all repositories
-dashboard.git_gc_repos_success = All repositories have finished garbage collection.
+dashboard.git_gc_repos_success = Garbage collection started for all repositories.
 dashboard.resync_all_sshkeys = Update the '.ssh/authorized_keys' file with Gitea SSH keys. (Not needed for the built-in SSH server.)
 dashboard.resync_all_sshkeys_success = The public SSH keys controlled by Gitea have been updated.
 dashboard.resync_all_hooks = Resynchronize pre-receive, update and post-receive hooks of all repositories.

routers/admin/admin.go

@@ -6,6 +6,7 @@
 package admin
 
 import (
+	gocontext "context"
 	"encoding/json"
 	"fmt"
 	"net/url"
@@ -178,8 +179,13 @@ func DashboardPost(ctx *context.Context, form auth.AdminDashboardForm) {
 			success = ctx.Tr("admin.dashboard.delete_missing_repos_success")
 			err = repo_module.DeleteMissingRepositories(ctx.User)
 		case gitGCRepos:
-			success = ctx.Tr("admin.dashboard.git_gc_repos_success")
-			err = repo_module.GitGcRepos(shutdownCtx)
+			success = ctx.Tr("admin.dashboard.git_gc_repos_started")
+			go graceful.GetManager().RunWithShutdownContext(func(ctx gocontext.Context) {
+				err := repo_module.GitGcRepos
+				if err != nil {
+					log.Error("Error whilst running git gc: %v", err)
+				}
+			})
 		case syncSSHAuthorizedKey:
 			success = ctx.Tr("admin.dashboard.resync_all_sshkeys_success")
 			err = models.RewriteAllPublicKeys()
@@ -194,7 +200,12 @@ func DashboardPost(ctx *context.Context, form auth.AdminDashboardForm) {
 			go graceful.GetManager().RunWithShutdownContext(models.SyncExternalUsers)
 		case gitFsck:
 			success = ctx.Tr("admin.dashboard.git_fsck_started")
-			err = repo_module.GitFsck(shutdownCtx)
+			go graceful.GetManager().RunWithShutdownContext(func(ctx gocontext.Context) {
+				err := repo_module.GitFsck
+				if err != nil {
+					log.Error("Error whilst running git fsck: %v", err)
+				}
+			})
 		case deleteGeneratedRepositoryAvatars:
 			success = ctx.Tr("admin.dashboard.delete_generated_repository_avatars_success")
 			err = models.RemoveRandomAvatars()