Remove cancallation token

RichardChen820 · RichardChen820 · commit 0f8a5d29d0e4 · 2023-12-07T07:43:20.000+08:00
diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs
@@ -194,7 +194,7 @@ public async Task RefreshAsync(CancellationToken cancellationToken)
                         return;
                     }
 
-                    IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients(cancellationToken);
+                    IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients();
 
                     if (!availableClients.Any())
                     {
@@ -563,7 +563,7 @@ private async Task LoadAsync(bool ignoreFailures, CancellationToken cancellation
             {
                 while (true)
                 {
-                    IEnumerable<ConfigurationClient> clients = _configClientManager.GetAllClients(cancellationToken);
+                    IEnumerable<ConfigurationClient> clients = _configClientManager.GetAllClients();
 
                     if (await TryInitializeAsync(clients, startupExceptions, cancellationToken).ConfigureAwait(false))
                     {
diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationClientManager.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/ConfigurationClientManager.cs
@@ -112,15 +112,15 @@ internal ConfigurationClientManager(IList<ConfigurationClientWrapper> clients)
             _clients = clients;
         }
 
-        public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken)
+        public IEnumerable<ConfigurationClient> GetAvailableClients()
         {
             DateTimeOffset now = DateTimeOffset.UtcNow;
 
             if (_replicaDiscoveryEnabled && IsFallbackClientDiscoveryDue(now))
             {
                 _lastFallbackClientRefreshAttempt = now;
 
-                _ = DiscoverFallbackClients(cancellationToken).SwallowCancellation();
+                _ = DiscoverFallbackClients();
             }
 
             List<ConfigurationClient> clients = new List<ConfigurationClient>(_clients.Where(c => c.BackoffEndTime <= now).Select(c => c.Client));
@@ -139,15 +139,15 @@ public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken ca
             return clients;
         }
 
-        public IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken)
+        public IEnumerable<ConfigurationClient> GetAllClients()
         {
             DateTimeOffset now = DateTimeOffset.UtcNow;
 
             if (_replicaDiscoveryEnabled && IsFallbackClientDiscoveryDue(now))
             {
                 _lastFallbackClientRefreshAttempt = now;
 
-                _ = DiscoverFallbackClients(cancellationToken).SwallowCancellation();
+                _ = DiscoverFallbackClients();
             }
 
             List<ConfigurationClient> clients = new List<ConfigurationClient>(_clients.Select(c => c.Client));
@@ -250,17 +250,17 @@ public void SetLogger(Logger logger)
             _logger = logger;
         }
 
-        private async Task DiscoverFallbackClients(CancellationToken cancellationToken)
+        private async Task DiscoverFallbackClients()
         {
-            using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            using var cts = new CancellationTokenSource();
 
             cts.CancelAfter(MinimalClientRefreshInterval);
 
             try
             {
                 await RefreshFallbackClients(cts.Token).ConfigureAwait(false);
             }
-            catch (OperationCanceledException e) when (!cancellationToken.IsCancellationRequested)
+            catch (OperationCanceledException e)
             {
                 _logger.LogWarning(LogHelper.BuildFallbackClientLookupFailMessage(e.Message));
             }
@@ -327,15 +327,10 @@ private async Task RefreshFallbackClients(CancellationToken cancellationToken)
 
         private bool IsFallbackClientDiscoveryDue(DateTimeOffset dateTime)
         {
-            if (dateTime >= _lastFallbackClientRefreshAttempt + MinimalClientRefreshInterval &&
+            return dateTime >= _lastFallbackClientRefreshAttempt + MinimalClientRefreshInterval &&
                 (_dynamicClients == null ||
                 _dynamicClients.All(c => c.BackoffEndTime > dateTime) ||
-                dateTime >= _lastFallbackClientRefresh + FallbackClientRefreshExpireInterval))
-            {
-                return true;
-            }
-
-            return false;
+                dateTime >= _lastFallbackClientRefresh + FallbackClientRefreshExpireInterval);
         }
 
         private string GetValidDomain(Uri endpoint)
diff --git a/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationClientManager.cs b/src/Microsoft.Extensions.Configuration.AzureAppConfiguration/IConfigurationClientManager.cs
@@ -11,9 +11,9 @@ namespace Microsoft.Extensions.Configuration.AzureAppConfiguration
 {
     internal interface IConfigurationClientManager
     {
-        IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken);
+        IEnumerable<ConfigurationClient> GetAvailableClients();
 
-        IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken);
+        IEnumerable<ConfigurationClient> GetAllClients();
 
         void UpdateClientStatus(ConfigurationClient client, bool successful);
 
diff --git a/tests/Tests.AzureAppConfiguration/FailoverTests.cs b/tests/Tests.AzureAppConfiguration/FailoverTests.cs
@@ -54,7 +54,7 @@ public void FailOverTests_DoesNotReturnBackedOffClient()
             var configClientManager = new ConfigurationClientManager(clientList);
 
             // The client enumerator should return 2 clients for the first time.
-            Assert.Equal(2, configClientManager.GetAvailableClients(CancellationToken.None).Count());
+            Assert.Equal(2, configClientManager.GetAvailableClients().Count());
 
             var config = new ConfigurationBuilder()
                 .AddAzureAppConfiguration(options =>
@@ -73,7 +73,7 @@ public void FailOverTests_DoesNotReturnBackedOffClient()
                 .Build();
 
             // The client enumerator should return just 1 client since one client is in the backoff state.
-            Assert.Single(configClientManager.GetAvailableClients(CancellationToken.None));
+            Assert.Single(configClientManager.GetAvailableClients());
         }
 
         [Fact]
@@ -108,7 +108,7 @@ public void FailOverTests_ReturnsAllClientsIfAllBackedOff()
             var configClientManager = new ConfigurationClientManager(clientList);
 
             // The client enumerator should return 2 clients for the first time.
-            Assert.Equal(2, configClientManager.GetAvailableClients(CancellationToken.None).Count());
+            Assert.Equal(2, configClientManager.GetAvailableClients().Count());
 
             var configBuilder = new ConfigurationBuilder()
                 .AddAzureAppConfiguration(options =>
@@ -140,7 +140,7 @@ public void FailOverTests_ReturnsAllClientsIfAllBackedOff()
             Assert.True((exception.InnerException as AggregateException)?.InnerExceptions?.All(e => e is RequestFailedException) ?? false);
 
             // The client manager should return no clients since all clients are in the back-off state.
-            Assert.False(configClientManager.GetAvailableClients(CancellationToken.None).Any());
+            Assert.False(configClientManager.GetAvailableClients().Any());
         }
 
         [Fact]
@@ -175,7 +175,7 @@ public void FailOverTests_PropagatesNonFailOverableExceptions()
             var configClientManager = new ConfigurationClientManager(clientList);
 
             // The client enumerator should return 2 clients for the first time.
-            Assert.Equal(2, configClientManager.GetAvailableClients(CancellationToken.None).Count());
+            Assert.Equal(2, configClientManager.GetAvailableClients().Count());
 
             var configBuilder = new ConfigurationBuilder()
                 .AddAzureAppConfiguration(options =>
@@ -234,7 +234,7 @@ public void FailOverTests_BackoffStateIsUpdatedOnSuccessfulRequest()
             var configClientManager = new ConfigurationClientManager(clientList);
 
             // The client enumerator should return 2 clients for the first time.
-            Assert.Equal(2, configClientManager.GetAvailableClients(CancellationToken.None).Count());
+            Assert.Equal(2, configClientManager.GetAvailableClients().Count());
 
             var config = new ConfigurationBuilder()
                 .AddAzureAppConfiguration(options =>
@@ -251,15 +251,15 @@ public void FailOverTests_BackoffStateIsUpdatedOnSuccessfulRequest()
                 }).Build();
 
             // The client enumerator should return just 1 client for the second time.
-            Assert.Single(configClientManager.GetAvailableClients(CancellationToken.None));
+            Assert.Single(configClientManager.GetAvailableClients());
 
             // Sleep for backoff-time to pass.
             Thread.Sleep(TimeSpan.FromSeconds(31));
 
             refresher.RefreshAsync().Wait();
 
             // The client enumerator should return 2 clients for the third time.
-            Assert.Equal(2, configClientManager.GetAvailableClients(CancellationToken.None).Count());
+            Assert.Equal(2, configClientManager.GetAvailableClients().Count());
         }
 
         [Fact]
@@ -372,7 +372,7 @@ public void FailOverTests_GetNoDynamicClient()
                 new ConfigurationClientOptions(),
                 true);
 
-            var clients = configClientManager.GetAvailableClients(CancellationToken.None);
+            var clients = configClientManager.GetAvailableClients();
 
             // Only contains the client that passed while constructing the ConfigurationClientManager
             Assert.Single(clients);
diff --git a/tests/Tests.AzureAppConfiguration/MockedConfigurationClientManager.cs b/tests/Tests.AzureAppConfiguration/MockedConfigurationClientManager.cs
@@ -59,12 +59,12 @@ public Uri GetEndpointForClient(ConfigurationClient client)
             return currentClient?.Endpoint;
         }
 
-        public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken)
+        public IEnumerable<ConfigurationClient> GetAvailableClients()
         {
-            return GetAllClients(cancellationToken);
+            return GetAllClients();
         }
 
-        public IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken)
+        public IEnumerable<ConfigurationClient> GetAllClients()
         {
             var result = new List<ConfigurationClient>();
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public async Task RefreshAsync(CancellationToken cancellationToken)`
`194`	`194`	`return;`
`195`	`195`	`}`
`196`	`196`
`197`		`- IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients(cancellationToken);`
	`197`	`+ IEnumerable<ConfigurationClient> availableClients = _configClientManager.GetAvailableClients();`
`198`	`198`
`199`	`199`	`if (!availableClients.Any())`
`200`	`200`	`{`
`@@ -563,7 +563,7 @@ private async Task LoadAsync(bool ignoreFailures, CancellationToken cancellation`
`563`	`563`	`{`
`564`	`564`	`while (true)`
`565`	`565`	`{`
`566`		`- IEnumerable<ConfigurationClient> clients = _configClientManager.GetAllClients(cancellationToken);`
	`566`	`+ IEnumerable<ConfigurationClient> clients = _configClientManager.GetAllClients();`
`567`	`567`
`568`	`568`	`if (await TryInitializeAsync(clients, startupExceptions, cancellationToken).ConfigureAwait(false))`
`569`	`569`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,15 +112,15 @@ internal ConfigurationClientManager(IList<ConfigurationClientWrapper> clients)`
`112`	`112`	`_clients = clients;`
`113`	`113`	`}`
`114`	`114`
`115`		`- public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken)`
	`115`	`+ public IEnumerable<ConfigurationClient> GetAvailableClients()`
`116`	`116`	`{`
`117`	`117`	`DateTimeOffset now = DateTimeOffset.UtcNow;`
`118`	`118`
`119`	`119`	`if (_replicaDiscoveryEnabled && IsFallbackClientDiscoveryDue(now))`
`120`	`120`	`{`
`121`	`121`	`_lastFallbackClientRefreshAttempt = now;`
`122`	`122`
`123`		`- _ = DiscoverFallbackClients(cancellationToken).SwallowCancellation();`
	`123`	`+ _ = DiscoverFallbackClients();`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`List<ConfigurationClient> clients = new List<ConfigurationClient>(_clients.Where(c => c.BackoffEndTime <= now).Select(c => c.Client));`
`@@ -139,15 +139,15 @@ public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken ca`
`139`	`139`	`return clients;`
`140`	`140`	`}`
`141`	`141`
`142`		`- public IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken)`
	`142`	`+ public IEnumerable<ConfigurationClient> GetAllClients()`
`143`	`143`	`{`
`144`	`144`	`DateTimeOffset now = DateTimeOffset.UtcNow;`
`145`	`145`
`146`	`146`	`if (_replicaDiscoveryEnabled && IsFallbackClientDiscoveryDue(now))`
`147`	`147`	`{`
`148`	`148`	`_lastFallbackClientRefreshAttempt = now;`
`149`	`149`
`150`		`- _ = DiscoverFallbackClients(cancellationToken).SwallowCancellation();`
	`150`	`+ _ = DiscoverFallbackClients();`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`List<ConfigurationClient> clients = new List<ConfigurationClient>(_clients.Select(c => c.Client));`
`@@ -250,17 +250,17 @@ public void SetLogger(Logger logger)`
`250`	`250`	`_logger = logger;`
`251`	`251`	`}`
`252`	`252`
`253`		`- private async Task DiscoverFallbackClients(CancellationToken cancellationToken)`
	`253`	`+ private async Task DiscoverFallbackClients()`
`254`	`254`	`{`
`255`		`- using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);`
	`255`	`+ using var cts = new CancellationTokenSource();`
`256`	`256`
`257`	`257`	`cts.CancelAfter(MinimalClientRefreshInterval);`
`258`	`258`
`259`	`259`	`try`
`260`	`260`	`{`
`261`	`261`	`await RefreshFallbackClients(cts.Token).ConfigureAwait(false);`
`262`	`262`	`}`
`263`		`- catch (OperationCanceledException e) when (!cancellationToken.IsCancellationRequested)`
	`263`	`+ catch (OperationCanceledException e)`
`264`	`264`	`{`
`265`	`265`	`_logger.LogWarning(LogHelper.BuildFallbackClientLookupFailMessage(e.Message));`
`266`	`266`	`}`
`@@ -327,15 +327,10 @@ private async Task RefreshFallbackClients(CancellationToken cancellationToken)`
`327`	`327`
`328`	`328`	`private bool IsFallbackClientDiscoveryDue(DateTimeOffset dateTime)`
`329`	`329`	`{`
`330`		`- if (dateTime >= _lastFallbackClientRefreshAttempt + MinimalClientRefreshInterval &&`
	`330`	`+ return dateTime >= _lastFallbackClientRefreshAttempt + MinimalClientRefreshInterval &&`
`331`	`331`	`(_dynamicClients == null \|\|`
`332`	`332`	`_dynamicClients.All(c => c.BackoffEndTime > dateTime) \|\|`
`333`		`- dateTime >= _lastFallbackClientRefresh + FallbackClientRefreshExpireInterval))`
`334`		`- {`
`335`		`- return true;`
`336`		`- }`
`337`		`-`
`338`		`- return false;`
	`333`	`+ dateTime >= _lastFallbackClientRefresh + FallbackClientRefreshExpireInterval);`
`339`	`334`	`}`
`340`	`335`
`341`	`336`	`private string GetValidDomain(Uri endpoint)`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ namespace Microsoft.Extensions.Configuration.AzureAppConfiguration`
`11`	`11`	`{`
`12`	`12`	`internal interface IConfigurationClientManager`
`13`	`13`	`{`
`14`		`- IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken);`
	`14`	`+ IEnumerable<ConfigurationClient> GetAvailableClients();`
`15`	`15`
`16`		`- IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken);`
	`16`	`+ IEnumerable<ConfigurationClient> GetAllClients();`
`17`	`17`
`18`	`18`	`void UpdateClientStatus(ConfigurationClient client, bool successful);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,12 @@ public Uri GetEndpointForClient(ConfigurationClient client)`
`59`	`59`	`return currentClient?.Endpoint;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public IEnumerable<ConfigurationClient> GetAvailableClients(CancellationToken cancellationToken)`
	`62`	`+ public IEnumerable<ConfigurationClient> GetAvailableClients()`
`63`	`63`	`{`
`64`		`- return GetAllClients(cancellationToken);`
	`64`	`+ return GetAllClients();`
`65`	`65`	`}`
`66`	`66`
`67`		`- public IEnumerable<ConfigurationClient> GetAllClients(CancellationToken cancellationToken)`
	`67`	`+ public IEnumerable<ConfigurationClient> GetAllClients()`
`68`	`68`	`{`
`69`	`69`	`var result = new List<ConfigurationClient>();`
`70`	`70`