Merge pull request #193 maintenance: move maintenance task management…

… to service

maintenance: move maintenance task management to service

Scalar.Common/Maintenance/MaintenanceTasks.cs

@@ -0,0 +1,33 @@
+using System;
+
+namespace Scalar.Common.Maintenance
+{
+    public static class MaintenanceTasks
+    {
+        public enum Task
+        {
+            Invalid = 0,
+            FetchCommitsAndTrees,
+            LooseObjects,
+            PackFiles,
+            CommitGraph,
+        }
+
+        public static string GetVerbTaskName(Task task)
+        {
+            switch (task)
+            {
+                case Task.FetchCommitsAndTrees:
+                    return ScalarConstants.VerbParameters.Maintenance.FetchCommitsAndTreesTaskName;
+                case Task.LooseObjects:
+                    return ScalarConstants.VerbParameters.Maintenance.LooseObjectsTaskName;
+                case Task.PackFiles:
+                    return ScalarConstants.VerbParameters.Maintenance.PackFilesTaskName;
+                case Task.CommitGraph:
+                    return ScalarConstants.VerbParameters.Maintenance.CommitGraphTaskName;
+                default:
+                    throw new ArgumentException($"Invalid or unknown task {task.ToString()}", nameof(task));
+            }
+        }
+    }
+}

Scalar.Common/ScalarConstants.cs

@@ -204,6 +204,18 @@ public static class Unmount
             {
                 public const string SkipLock = "skip-wait-for-lock";
             }
+
+            public static class Maintenance
+            {
+                public const string Task = "task";
+
+                public const string FetchCommitsAndTreesTaskName = "fetch-commits-and-trees";
+                public const string LooseObjectsTaskName = "loose-objects";
+                public const string PackFilesTaskName = "pack-files";
+                public const string CommitGraphTaskName = "commit-graph";
+
+                public const string BatchSizeOptionName = "batch-size";
+            }
         }
 
         public static class UpgradeVerbMessages

Scalar.Mount/InProcessMount.cs

@@ -17,7 +17,6 @@ public class InProcessMount
 
         private ScalarEnlistment enlistment;
         private ITracer tracer;
-        private GitMaintenanceScheduler maintenanceScheduler;
 
         private CacheServerInfo cacheServer;
         private RetryConfig retryConfig;
@@ -181,7 +180,7 @@ private T CreateOrReportAndExit<T>(Func<T> factory, string reportMessage)
             }
         }
 
-        private void HandleRequest(ITracer tracer, string request, NamedPipeServer.Connection connection)
+        private void HandleRequest(ITracer requestTracer, string request, NamedPipeServer.Connection connection)
         {
             NamedPipeMessages.Message message = NamedPipeMessages.Message.FromString(request);
 
@@ -258,7 +257,6 @@ private void HandleUnmountRequest(NamedPipeServer.Connection connection)
                     this.currentState = MountState.Unmounting;
 
                     connection.TrySendResponse(NamedPipeMessages.Unmount.Acknowledged);
-                    this.UnmountAndStopWorkingDirectoryCallbacks();
                     connection.TrySendResponse(NamedPipeMessages.Unmount.Completed);
 
                     this.unmountEvent.Set();
@@ -286,8 +284,6 @@ private void MountAndStartWorkingDirectoryCallbacks(CacheServerInfo cache)
             GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(this.context.Tracer, this.context.Enlistment, cache, this.retryConfig);
             this.gitObjects = new ScalarGitObjects(this.context, objectRequestor);
 
-            this.maintenanceScheduler = this.CreateOrReportAndExit(() => new GitMaintenanceScheduler(this.context, this.gitObjects), "Failed to start maintenance scheduler");
-
             int majorVersion;
             int minorVersion;
             if (!RepoMetadata.Instance.TryGetOnDiskLayoutVersion(out majorVersion, out minorVersion, out error))
@@ -303,14 +299,5 @@ private void MountAndStartWorkingDirectoryCallbacks(CacheServerInfo cache)
                     ScalarPlatform.Instance.DiskLayoutUpgrade.Version.CurrentMajorVersion);
             }
         }
-
-        private void UnmountAndStopWorkingDirectoryCallbacks()
-        {
-            if (this.maintenanceScheduler != null)
-            {
-                this.maintenanceScheduler.Dispose();
-                this.maintenanceScheduler = null;
-            }
-        }
     }
 }

Scalar.Service/IRegisteredUserStore.cs

@@ -0,0 +1,7 @@
+namespace Scalar.Service
+{
+    public interface IRegisteredUserStore
+    {
+        UserAndSession RegisteredUser { get; }
+    }
+}

Scalar.Service/IRepoRegistry.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Scalar.Common.Maintenance;
 
 namespace Scalar.Service
 {
@@ -8,7 +9,7 @@ public interface IRepoRegistry
         bool TryDeactivateRepo(string repoRoot, out string errorMessage);
         bool TryGetActiveRepos(out List<RepoRegistration> repoList, out string errorMessage);
         bool TryRemoveRepo(string repoRoot, out string errorMessage);
-        void AutoMountRepos(string userId, int sessionId);
+        void RunMaintenanceTaskForRepos(MaintenanceTasks.Task task, string userId, int sessionId);
         void TraceStatus();
     }
 }

Scalar.Service/IScalarVerbRunner.cs

@@ -0,0 +1,9 @@
+using Scalar.Common.Maintenance;
+
+namespace Scalar.Service
+{
+    public interface IScalarVerbRunner
+    {
+        bool CallMaintenance(MaintenanceTasks.Task task, string repoRoot, int sessionId);
+    }
+}

Scalar.Service/IServiceTask.cs

@@ -0,0 +1,8 @@
+namespace Scalar.Service
+{
+    public interface IServiceTask
+    {
+        void Execute();
+        void Stop();
+    }
+}