Skip to content

[Server] [Regression] fix Sampling Group disposing m_shutdownEvent in Shutdown Method. Fix double call of Shutdown Method #3070

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
mrsuciu merged 4 commits into from
May 23, 2025
Merged

[Server] [Regression] fix Sampling Group disposing m_shutdownEvent in Shutdown Method. Fix double call of Shutdown Method #3070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98cbfa7
fix Sampling Group disposing m_shutdownEvent in Shutdown Method. Fix …
romanett May 2, 2025
837453d
Dont dispose running task, will be cleaned up by GC once shutdown eve…
romanett May 18, 2025
1a50cf2
Remove disposal of shutdown event that is needed to stop the task gra…
romanett May 18, 2025
4b7adee
Ensure graceful dispose
romanett May 18, 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
14 changes: 12 additions & 2 deletions Libraries/Opc.Ua.Server/NodeManager/SamplingGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@
m_shutdownEvent.Set();
m_samplingRates.Clear();
}

if (m_samplingTask != null)
{
try
{
m_samplingTask.Wait();
}
catch (AggregateException) { /* Ignore exceptions on shutdown */ }

Check warning on line 111 in Libraries/Opc.Ua.Server/NodeManager/SamplingGroup.cs

View check run for this annotation

Codecov / codecov/patch

Libraries/Opc.Ua.Server/NodeManager/SamplingGroup.cs#L109-L111 

Added lines #L109 - L111 were not covered by tests
}

Utils.SilentDispose(m_samplingTask);
Utils.SilentDispose(m_shutdownEvent);

Check warning on line 115 in Libraries/Opc.Ua.Server/NodeManager/SamplingGroup.cs

View check run for this annotation

Codecov / codecov/patch

Libraries/Opc.Ua.Server/NodeManager/SamplingGroup.cs#L114-L115 

Added lines #L114 - L115 were not covered by tests
}
}
#endregion
Expand Down Expand Up @@ -130,9 +142,7 @@
{
m_shutdownEvent.Set();
m_items.Clear();
Utils.SilentDispose(m_samplingTask);
m_samplingTask = null;
Utils.SilentDispose(m_shutdownEvent);
}
}

Expand Down
1 change: 0 additions & 1 deletion Libraries/Opc.Ua.Server/NodeManager/SamplingGroupManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,6 @@ public virtual void ApplyChanges()
// remove unused groups.
foreach (SamplingGroup samplingGroup in unusedGroups)
{
samplingGroup.Shutdown();
m_samplingGroups.Remove(samplingGroup);
}
}
Expand Down
Loading