Skip to content

Inbox Subscription Memory leak .NetStandard2.0 #803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtmk merged 12 commits into from
Apr 9, 2025
Merged

Inbox Subscription Memory leak .NetStandard2.0 #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
afda21a
Inbox Subscription leak .NetStandard2.0
AdamsDaveAmag Apr 2, 2025
c42b831
Merge branch 'main' into adams-dave-main
mtmk Apr 8, 2025
64ccd79
Add test
mtmk Apr 8, 2025
755c7dc
Fixing workflows
mtmk Apr 8, 2025
c9c7050
Fixing workflows
mtmk Apr 8, 2025
7fd23f7
Fixing workflows
mtmk Apr 8, 2025
c0372ca
Fixing workflows
mtmk Apr 8, 2025
e317620
Revert to the original fixed state
mtmk Apr 8, 2025
fa7013d
Revert workflow change
mtmk Apr 8, 2025
f2fa175
Update workflow dotnet
mtmk Apr 8, 2025
2d4435a
Drop net6 from tests
mtmk Apr 9, 2025
2b3402f
Fix build
mtmk Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: |
6.x
8.x
9.x

- name: Check formatting
run: |
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: |
6.x
8.x
9.x

- name: Release Build
run: dotnet build -c Release tests/NATS.Client.Perf/NATS.Client.Perf.csproj
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ jobs:
echo "create=$create" | tee -a "$GITHUB_OUTPUT"

- if: ${{ fromJSON(steps.tag.outputs.create) }}
name: Setup dotnet
uses: actions/setup-dotnet@v3
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: |
6.x
8.x
9.x

- if: ${{ fromJSON(steps.tag.outputs.create) }}
name: Pack
Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Setup dotnet 6
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'

- name: Setup dotnet 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: |
6.x
8.x
9.x

- name: Build
run: dotnet build -c Release
Expand Down Expand Up @@ -175,15 +173,13 @@ jobs:
with:
fetch-depth: 0

- name: Setup dotnet 6
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'

- name: Setup dotnet 8
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.x'
dotnet-version: |
6.x
8.x
9.x

- name: Get nats-server
shell: bash
Expand Down
3 changes: 3 additions & 0 deletions src/NATS.Client.Core/Internal/InboxSub.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ public ValueTask RemoveAsync(NatsSubBase sub)
lock (subTable)
{
#if NETSTANDARD2_0
if (subTable.RemoveAll(item => item.TryGetTarget(out var refSub) && refSub == sub) == 0)
_logger.LogWarning(NatsLogEvents.InboxSubscription, "Unregistered message inbox received for {Subject}", sub.Subject);

if (subTable.Count == 0)
{
_bySubject.TryRemove(sub.Subject, out _);
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Core.MemoryTests/NATS.Client.Core.MemoryTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Core.Tests/NATS.Client.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);CS8002</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Core2.Tests/NATS.Client.Core2.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net481</TargetFrameworks>
<RuntimeIdentifiers Condition="'$(OS)' == 'Windows_NT'">any;win-x86</RuntimeIdentifiers>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.CoreUnit.Tests/NATS.Client.CoreUnit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net481</TargetFrameworks>
<RuntimeIdentifiers Condition="'$(OS)' == 'Windows_NT'">any;win-x86</RuntimeIdentifiers>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.JetStream.Tests/NATS.Client.JetStream.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.KeyValueStore.Tests/NATS.Client.KeyValueStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.KeyValueStore.Tests/NatsKVWatcherTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ public async Task ReadAfterDelete()
}
}
}
catch (TaskCanceledException exCancelled)
catch (TaskCanceledException)
{
Assert.Fail("Task was cancelled waiting for OnNoData");
}
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.ObjectStore.Tests/NATS.Client.ObjectStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Platform.Windows.Tests/NATS.Client.Platform.Windows.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net481</TargetFrameworks>
<TargetFrameworks>net8.0;net481</TargetFrameworks>
<RuntimeIdentifiers>any;win-x86</RuntimeIdentifiers>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Services.Tests/NATS.Client.Services.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.Simplified.Tests/NATS.Client.Simplified.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);CS8002</NoWarn>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Client.TestUtilities/NATS.Client.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion ...soft.DependencyInjection.Tests/NATS.Extensions.Microsoft.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);CS8002</NoWarn>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion tests/NATS.Net.OpenTelemetry.Tests/NATS.Net.OpenTelemetry.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);CS8002</NoWarn>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down