Merged PR 700609: Remove UpdateStaleLocalLastAccessTimes

Author: jbayardo

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

@@ -2221,8 +2221,7 @@ public ContentResolver(LocalLocationStore localLocationStore, IDistributedMachin
 
                 bool foundDistributedEntry = _localLocationStore.TryGetContentLocations(context, hash, out var distributedEntry);
 
-                if (_localLocationStore.Configuration.UpdateStaleLocalLastAccessTimes
-                    && foundLocalInfo
+                if (foundLocalInfo
                     && foundDistributedEntry
                     && distributedEntry.LastAccessTimeUtc.ToDateTime() > localInfo.LastAccessTimeUtc)
                 {

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

@@ -293,11 +293,6 @@ public bool IsValidForLls()
         /// </summary>
         public bool UseFullEvictionSort { get; set; } = false;
 
-        /// <summary>
-        /// Indicates whether local last access times should be updated if out of date with respect to distributed last access times
-        /// </summary>
-        public bool UpdateStaleLocalLastAccessTimes { get; set; } = false;
-
         /// <summary>
         /// Amount of entries to compute evictability metric for in a single pass. The larger this is, the faster the
         /// candidate pool fills up, but also the slower it is to produce a candidate. Helps control how fast we need

Public/Src/Cache/ContentStore/DistributedTest/ContentLocation/LocalLocationStoreDistributedContentTests.cs

@@ -2506,15 +2506,12 @@ public Task SelfEvictionTests()
         }
 
         [Theory]
-        [InlineData(true)]
-        [InlineData(false)]
-        public async Task TestFullSortEviction(bool updateStaleLocalAges)
+        public async Task TestFullSortEviction()
         {
             ConfigureWithOneMaster(dcs =>
             {
                 dcs.UseTieredDistributedEviction = true;
                 dcs.UseFullEvictionSort = true;
-                dcs.UpdateStaleLocalLastAccessTimes = updateStaleLocalAges;
             });
 
             var hashCount = 20_000;
@@ -2578,7 +2575,7 @@ await RunTestAsync(
 
                             llsEvictionPrecedence.Should().BeCloseTo(fullOrderPredecedence, 100, "Hash precedence should roughly match the precedence if hashes were all sorted");
 
-                            if (iteration == 0 || !updateStaleLocalAges)
+                            if (iteration == 0)
                             {
                                 // Local age and distributed age should not match
                                 info.LocalAge.Should().NotBe(info.Age);

Public/Src/Cache/DistributedCache.Host/Configuration/DistributedContentSettings.cs

@@ -290,12 +290,6 @@ public void DisableRedis()
         [DataMember]
         public bool UseFullEvictionSort { get; set; } = false;
 
-        /// <summary>
-        /// Configures whether ages of content are updated when sorting during eviction
-        /// </summary>
-        [DataMember]
-        public bool UpdateStaleLocalLastAccessTimes { get; set; } = false;
-
         /// <summary>
         /// Configures whether to use new tiered eviction logic or not.
         /// </summary>

Public/Src/Cache/DistributedCache.Host/Service/Internal/DistributedContentStoreFactory.cs

@@ -183,7 +183,6 @@ private LocalLocationStoreConfiguration CreateContentLocationStoreConfiguration(
                 UseFullEvictionSort = _distributedSettings.UseFullEvictionSort,
                 EvictionWindowSize = _distributedSettings.EvictionWindowSize,
                 EvictionPoolSize = _distributedSettings.EvictionPoolSize,
-                UpdateStaleLocalLastAccessTimes = _distributedSettings.UpdateStaleLocalLastAccessTimes,
                 EvictionRemovalFraction = _distributedSettings.EvictionRemovalFraction,
                 EvictionDiscardFraction = _distributedSettings.EvictionDiscardFraction,
                 UseTieredDistributedEviction = _distributedSettings.UseTieredDistributedEviction,