Skip to content
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

Fix race condition in MainMonitor #830

Merged
merged 10 commits into from
Nov 27, 2024
Merged

Fix race condition in MainMonitor #830

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b3dca6
test garnet benchmark
msft-paddy14 Oct 8, 2024
bb6f943
Merge branch 'main' of github.com:microsoft/garnet
msft-paddy14 Oct 29, 2024
2929295
Merge branch 'main' of github.com:microsoft/garnet
msft-paddy14 Nov 25, 2024
43c5c13
Revert "test garnet benchmark"
msft-paddy14 Nov 25, 2024
f3f3521
Fix race condition in disposing of metrics
msft-paddy14 Nov 25, 2024
a7c0ade
check for null
msft-paddy14 Nov 25, 2024
518a8b4
fix spacing
msft-paddy14 Nov 26, 2024
afc9017
add try finally blocks
msft-paddy14 Nov 27, 2024
3c2d820
fix whitespace
msft-paddy14 Nov 27, 2024
563df86
Merge branch 'main' into users/padgupta/fix_latency_dispose
vazois Nov 27, 2024
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
11 changes: 10 additions & 1 deletion libs/server/Metrics/Latency/GarnetLatencyMetricsSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ internal sealed class GarnetLatencyMetricsSession
public int PriorVersion => 1 - Version;
public LatencyMetricsEntrySession[] metrics;

private SingleWriterMultiReaderLock disposeLock;

public GarnetLatencyMetricsSession(GarnetServerMonitor monitor)
{
this.monitor = monitor;
Expand All @@ -30,7 +32,9 @@ public void Return()
{
metrics[(int)cmd].Return();
}
disposeLock.WriteLock();
vazois marked this conversation as resolved.
Show resolved Hide resolved
metrics = null;
disposeLock.WriteUnlock();
}

private void Init()
Expand Down Expand Up @@ -80,7 +84,12 @@ public void ResetAll()
public void Reset(LatencyMetricsType cmd)
{
int idx = (int)cmd;
metrics[idx].latency[PriorVersion].Reset();
disposeLock.WriteLock();
vazois marked this conversation as resolved.
Show resolved Hide resolved
if (metrics != null)
{
metrics[idx].latency[PriorVersion].Reset();
}
disposeLock.WriteUnlock();
}
}
}