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

Jump to bottom

PhysicalBridge always returns NoConnection after exception during message write / connection flush #1374

Merged
merged 3 commits into from
Mar 18, 2020
Merged

PhysicalBridge always returns NoConnection after exception during message write / connection flush #1374

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cefc81
Ensure that _activeMessage is always cleared, including if an excepti…
hamish-omny Mar 6, 2020
f33b340
Merge remote-tracking branch 'origin/master' into pr/1374
Mar 14, 2020
75e082b
Merge remote-tracking branch 'origin/master' into pr/1374
Mar 14, 2020
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
34 changes: 23 additions & 11 deletions src/StackExchange.Redis/PhysicalBridge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,12 +737,15 @@ internal WriteResult WriteMessageTakingWriteLockSync(PhysicalConnection physical
#pragma warning restore CS0618
}

UnmarkActiveMessage(message);
physical.SetIdle();
return result;
}
catch (Exception ex) { return HandleWriteException(message, ex); }
finally { token.Dispose(); }
finally
{
UnmarkActiveMessage(message);
token.Dispose();
}

}

Expand Down Expand Up @@ -887,7 +890,6 @@ private void ProcessBacklog()
}

_backlogStatus = BacklogStatus.MarkingInactive;
UnmarkActiveMessage(message);
if (result != WriteResult.Success)
{
_backlogStatus = BacklogStatus.RecordingWriteFailure;
Expand All @@ -901,6 +903,10 @@ private void ProcessBacklog()
_backlogStatus = BacklogStatus.RecordingFault;
HandleWriteException(message, ex);
}
finally
{
UnmarkActiveMessage(message);
}
}
_backlogStatus = BacklogStatus.SettingIdle;
physical.SetIdle();
Expand Down Expand Up @@ -985,21 +991,25 @@ internal ValueTask<WriteResult> WriteMessageTakingWriteLockAsync(PhysicalConnect

result = flush.Result; // we know it was completed, this is fine
}

UnmarkActiveMessage(message);

physical.SetIdle();

return new ValueTask<WriteResult>(result);
}
catch (Exception ex) { return new ValueTask<WriteResult>(HandleWriteException(message, ex)); }
finally
{
if (releaseLock & token.Success)
if (token.Success)
{
UnmarkActiveMessage(message);

if (releaseLock)
{
#if DEBUG
RecordLockDuration(lockTaken);
RecordLockDuration(lockTaken);
#endif
token.Dispose();
token.Dispose();
}
}
}
}
Expand Down Expand Up @@ -1029,8 +1039,7 @@ private async ValueTask<WriteResult> WriteMessageTakingWriteLockAsync_Awaited(Va
{
result = await physical.FlushAsync(false).ForAwait();
}

UnmarkActiveMessage(message);

physical.SetIdle();

#if DEBUG
Expand All @@ -1043,6 +1052,10 @@ private async ValueTask<WriteResult> WriteMessageTakingWriteLockAsync_Awaited(Va
{
return HandleWriteException(message, ex);
}
finally
{
UnmarkActiveMessage(message);
}
}

private async ValueTask<WriteResult> CompleteWriteAndReleaseLockAsync(LockToken lockToken, ValueTask<WriteResult> flush, Message message, int lockTaken)
Expand All @@ -1052,7 +1065,6 @@ private async ValueTask<WriteResult> CompleteWriteAndReleaseLockAsync(LockToken
try
{
var result = await flush.ForAwait();
UnmarkActiveMessage(message);
physical.SetIdle();
return result;
}
Expand Down