Merged PR 717056: Remove extra constructors in FileSystemContentStore and remove ColdStorage

Author: jbayardo

Public/Src/Cache/ContentStore/Distributed/NuCache/CachingCentralStorage.cs

@@ -62,11 +62,11 @@ public CachingCentralStorage(
                     new ContentStoreConfiguration(new MaxSizeQuota(hardExpression: maxRetentionMb + "MB", softExpression: softRetentionMb + "MB")),
                     ConfigurationSelection.RequireAndUseInProcessConfiguration),
                 settings: new ContentStoreSettings()
-                {
-                    TraceFileSystemContentStoreDiagnosticMessages = Configuration.TraceFileSystemContentStoreDiagnosticMessages,
-                    SelfCheckSettings = Configuration.SelfCheckSettings,
-                    UsePhysicalSizeInQuotaKeeper = Configuration.UsePhysicalSizeInQuotaKeeper,
-                });
+                          {
+                              TraceFileSystemContentStoreDiagnosticMessages = Configuration.TraceFileSystemContentStoreDiagnosticMessages,
+                              SelfCheckSettings = Configuration.SelfCheckSettings,
+                              UsePhysicalSizeInQuotaKeeper = Configuration.UsePhysicalSizeInQuotaKeeper,
+                          });
 
             LinkLifetime(fallbackStorage);
             LinkLifetime(PrivateCas);

Public/Src/Cache/ContentStore/Distributed/NuCache/LocalLocationStore.cs

@@ -157,8 +157,6 @@ public sealed class LocalLocationStore : StartupShutdownComponentBase
 
         private readonly MachineLocationResolver.Settings _machineListSettings = new();
 
-        private readonly ColdStorage? _coldStorage;
-
         private readonly ReadOnlyArray<PartitionId> _evictionPartitions;
 
         private readonly byte[] _machineHash;
@@ -171,8 +169,7 @@ public LocalLocationStore(
             LocalLocationStoreConfiguration configuration,
             CheckpointManager checkpointManager,
             IMasterElectionMechanism masterElectionMechanism,
-            ClusterStateManager clusterStateManager,
-            ColdStorage? coldStorage)
+            ClusterStateManager clusterStateManager)
         {
             Contract.RequiresNotNull(clock);
             Contract.RequiresNotNull(configuration);
@@ -185,7 +182,6 @@ public LocalLocationStore(
             ClusterStateManager = clusterStateManager;
 
             _checkpointRegistry = checkpointManager.CheckpointRegistry;
-            _coldStorage = coldStorage;
             _evictionPartitions = PartitionId.GetPartitions(Configuration.Settings.EvictionPartitionCount);
 
             _machineHash = MurmurHash3.Create(Encoding.UTF8.GetBytes(Configuration.PrimaryMachineLocation.Path ?? string.Empty)).ToByteArray();
@@ -624,12 +620,6 @@ async Task<Result<bool>> processStateCoreAsync()
 
                         var leadershipState = await MasterElectionMechanism.GetRoleAsync(context).ThrowIfFailureAsync();
 
-                        if (_coldStorage != null)
-                        {
-                            // We update the ColdStorage consistent-hashing ring on every heartbeat in case the cluster state has changed 
-                            _coldStorage.UpdateRingAsync(context, ClusterState).FireAndForget(context);
-                        }
-
                         await ProcessStateAsync(context, checkpointState, leadershipState, inline, forceRestore).ThrowIfFailureAsync();
 
                         return false;

Public/Src/Cache/ContentStore/Distributed/Services/ContentLocationStoreServices.cs

@@ -21,9 +21,6 @@ public record ContentLocationStoreServicesDependencies
         /// <nodoc />
         public OptionalServiceDefinition<IGlobalCacheService> GlobalCacheService { get; init; }
 
-        /// <nodoc />
-        public OptionalServiceDefinition<ColdStorage> ColdStorage { get; init; }
-
         /// <nodoc />
         public OptionalServiceDefinition<IRoleObserver> RoleObserver { get; init; }
 
@@ -162,8 +159,7 @@ private LocalLocationStore CreateLocalLocationStore()
                 Configuration,
                 CheckpointManager.Instance,
                 MasterElectionMechanism.Instance,
-                ClusterStateManager.Instance,
-                Dependencies?.ColdStorage.InstanceOrDefault());
+                ClusterStateManager.Instance);
         }
 
         private CentralStreamStorage CreateCentralStorage()

Public/Src/Cache/ContentStore/Distributed/Services/DistributedContentStoreServices.cs

@@ -72,9 +72,6 @@ public class DistributedContentStoreServices : ServicesCreatorBase
         /// <nodoc />
         public IServiceDefinition<RocksDbContentMetadataStore> RocksDbContentMetadataStore { get; }
 
-        /// <nodoc />
-        public OptionalServiceDefinition<ColdStorage> ColdStorage { get; }
-
         /// <nodoc />
         public OptionalServiceDefinition<IRoleObserver> RoleObserver { get; }
 
@@ -110,11 +107,6 @@ internal DistributedContentStoreServices(DistributedContentStoreServicesArgument
 
             ContentLocationStoreServices = Create(() => ContentLocationStoreFactory.Instance.Services);
 
-            ColdStorage = CreateOptional(() => DistributedContentSettings.ColdStorageSettings != null, () =>
-            {
-                return new ColdStorage(Arguments.FileSystem, DistributedContentSettings.ColdStorageSettings, Arguments.DistributedContentCopier);
-            });
-
             ContentLocationStoreFactory = Create(() =>
             {
                 return new ContentLocationStoreFactory(
@@ -126,7 +118,6 @@ internal DistributedContentStoreServices(DistributedContentStoreServicesArgument
                         Dependencies = new ContentLocationStoreServicesDependencies()
                         {
                             GlobalCacheService = GlobalCacheService.UnsafeGetServiceDefinition().AsOptional<IGlobalCacheService>(),
-                            ColdStorage = ColdStorage,
                             RoleObserver = RoleObserver,
                             DistributedContentSettings = CreateOptional(() => true, () => DistributedContentSettings),
                             GlobalCacheCheckpointManager = GlobalCacheCheckpointManager.AsOptional()

Public/Src/Cache/ContentStore/Distributed/Sessions/DistributedContentSession.cs

@@ -77,8 +77,6 @@ internal enum Counters
         /// </summary>
         internal readonly IContentLocationStore ContentLocationStore;
 
-        private readonly ColdStorage _coldStorage;
-
         /// <summary>
         /// The machine location for the current cache.
         /// </summary>
@@ -120,7 +118,6 @@ public DistributedContentSession(
             DistributedContentCopier contentCopier,
             DistributedContentStore distributedContentStore,
             MachineLocation localMachineLocation,
-            ColdStorage coldStorage,
             DistributedContentStoreSettings settings = default)
             : base(name)
         {
@@ -139,8 +136,6 @@ public DistributedContentSession(
             DistributedCopier = contentCopier;
             PutAndPlaceFileGate = new SemaphoreSlim(Settings.MaximumConcurrentPutAndPlaceFileOperations);
 
-            _coldStorage = coldStorage;
-
             _buildRingMachinesCache = new ExpiringValue<MachineLocation[]>(
                 Settings.ProactiveCopyInRingMachineLocationsExpiryCache,
                 SystemClock.Instance,
@@ -769,28 +764,6 @@ await ContentLocationStore.GetBulkAsync(
                                                                                            reason);
                                                                                    };
 
-            // If ColdStorage is ON try to place files from it before use remote locations
-            if (_coldStorage != null)
-            {
-                return Workflows.RunWithFallback(
-                    hashesWithPaths,
-                    initialFunc: async args => { return await _coldStorage.FetchThenPutBulkAsync(context, args, Inner); },
-                    fallbackFunc: initialFunc,
-                    secondFallbackFunc: fallbackFunc,
-                    thirdFallbackFunc: async args =>
-                                       {
-                                           var coldStorageGetBulkResult = _coldStorage.GetBulkLocations(context, args);
-                                           return await FetchFromContentLocationStoreThenPutAsync(
-                                               context,
-                                               args,
-                                               GetBulkOrigin.ColdStorage,
-                                               urgencyHint,
-                                               coldStorageGetBulkResult,
-                                               reason);
-                                       },
-                    isSuccessFunc: result => IsPlaceFileSuccess(result));
-            }
-
             return Workflows.RunWithFallback(
                 hashesWithPaths,
                 initialFunc: initialFunc,