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 ENTRY_ABORTED assertion in sendClientOldEntry() #1903

Closed
wants to merge 1 commit into from
Closed

Fix ENTRY_ABORTED assertion in sendClientOldEntry() #1903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/client_side_reply.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,8 +388,15 @@ clientReplyContext::sendClientOldEntry()
{
/* Get the old request back */
restoreState();

if (EBIT_TEST(http->storeEntry()->flags, ENTRY_ABORTED)) {
debugs(88, 3, "stale entry aborted while we revalidated: " << *http->storeEntry());
http->updateLoggingTags(LOG_TCP_MISS);
processMiss();
return;
}

/* here the data to send is in the next nodes buffers already */
assert(!EBIT_TEST(http->storeEntry()->flags, ENTRY_ABORTED));
Assure(matchesStreamBodyBuffer(lastStreamBufferedBytes));
Assure(!lastStreamBufferedBytes.offset);
sendMoreData(lastStreamBufferedBytes);
Expand Down Expand Up @@ -551,7 +558,12 @@ clientReplyContext::cacheHit(const StoreIOBuffer result)
return;
}

assert(!EBIT_TEST(e->flags, ENTRY_ABORTED));
if (EBIT_TEST(e->flags, ENTRY_ABORTED)) {
debugs(88, 3, "refusing aborted " << *e);
http->updateLoggingTags(LOG_TCP_MISS);
processMiss();
return;
}

/*
* Got the headers, now grok them
Expand Down