Merge pull request #475 from Azure/dev

* Fix infinite loop in ConcurrentExpiringSet and slow down cleanup to prevent a pegged CPU. (#473)
* Updating version to 3.0.2 (#474)
* Updating amqp nuget to 2.3.0

Author: nemakam

src/Microsoft.Azure.ServiceBus/Microsoft.Azure.ServiceBus.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This is the next generation Azure Service Bus .NET Standard client library that focuses on queues &amp; topics. For more information about Service Bus, see https://azure.microsoft.com/en-us/services/service-bus/</Description>
-    <Version>3.0.1</Version>
+    <Version>3.0.2</Version>
     <Authors>Microsoft</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>
@@ -30,7 +30,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="[2.2.0, 3.0.0)" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="[2.3.0, 3.0.0)" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="[1.0.1, 2.0.0)" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="[3.17.2, 4.0.0)" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />

src/Microsoft.Azure.ServiceBus/Primitives/ConcurrentExpiringSet.cs

@@ -27,7 +27,7 @@ public void AddOrUpdate(TKey key, DateTime expiration)
         public bool Contains(TKey key)
         {
             DateTime expiration;
-            if (this.dictionary.TryGetValue(key, out expiration))
+            if (this.dictionary.TryGetValue(key, out expiration) && expiration > DateTime.UtcNow)
             {
                 return true;
             }
@@ -39,18 +39,20 @@ void ScheduleCleanup()
         {
             lock (this.cleanupSynObject)
             {
-                if (this.cleanupScheduled)
+                if (this.cleanupScheduled || this.dictionary.Count <= 0)
                 {
                     return;
                 }
 
                 this.cleanupScheduled = true;
-                Task.Run(() => this.CollectExpiredEntries());
+                Task.Run(async () => await this.CollectExpiredEntries());
             }
         }
 
-        void CollectExpiredEntries()
+        async Task CollectExpiredEntries()
         {
+            await Task.Delay(TimeSpan.FromSeconds(30));
+
             lock (this.cleanupSynObject)
             {
                 this.cleanupScheduled = false;

test/Microsoft.Azure.ServiceBus.UnitTests/Primitives/ConcurrentExpiringSetTests.cs

@@ -0,0 +1,31 @@
+// ----------------------------------------------------------------------------
+// <copyright company="Microsoft Corporation" file="ConcurrentExpiringSetTests.cs">
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// </copyright>
+// ----------------------------------------------------------------------------
+
+namespace Microsoft.Azure.ServiceBus.UnitTests.Primitives
+{
+    using Microsoft.Azure.ServiceBus.Primitives;
+    using System;
+    using Xunit;
+
+    public class ConcurrentExpiringSetTests
+    {
+        [Fact]
+        public void Contains_returns_true_for_valid_entry()
+        {
+            var set = new ConcurrentExpiringSet<string>();
+            set.AddOrUpdate("testKey", DateTime.UtcNow + TimeSpan.FromSeconds(5));
+            Assert.True(set.Contains("testKey"), "The set should return true for a valid entry.");
+        }
+
+        [Fact]
+        public void Contains_returns_false_for_expired_entry()
+        {
+            var set = new ConcurrentExpiringSet<string>();
+            set.AddOrUpdate("testKey", DateTime.UtcNow - TimeSpan.FromSeconds(5));
+            Assert.False(set.Contains("testKey"), "The set should return false for an expired entry.");
+        }
+    }
+}