Skip to content

Fix ProxyFlow leak #93

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
lizan merged 4 commits into from
Feb 14, 2017
Merged

Fix ProxyFlow leak #93

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
690b3dc
Fix ProxyFlow leak
lizan Feb 14, 2017
4740b8b
Fix for large_streaming
lizan Feb 14, 2017
d70b4d9
Not call upstream finish during write success
lizan Feb 14, 2017
0fc5015
Merge branch 'master' into fix_grpc_leak
lizan Feb 14, 2017
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
13 changes: 6 additions & 7 deletions src/grpc/proxy_flow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,11 @@ void ProxyFlow::StartUpstreamWritesDone(std::shared_ptr<ProxyFlow> flow,
if (!ok) {
// Upstream is not writable, call finish to get status and
// and finish the call
StartUpstreamFinish(flow, Status::OK);
StartUpstreamFinish(flow);
return;
}
if (!status.ok()) {
StartUpstreamFinish(flow, status);
StartDownstreamFinish(flow, status);
return;
}
}));
Expand All @@ -300,7 +300,7 @@ void ProxyFlow::StartUpstreamWriteMessage(std::shared_ptr<ProxyFlow> flow) {
if (!ok) {
// Upstream is not writable, call finish to get status and
// and finish the call
StartUpstreamFinish(flow, Status::OK);
StartUpstreamFinish(flow);
return;
}
// Now that the write has completed, it's safe to start the
Expand Down Expand Up @@ -362,7 +362,7 @@ void ProxyFlow::StartUpstreamReadMessage(std::shared_ptr<ProxyFlow> flow) {
&flow->upstream_to_downstream_buffer_,
flow->async_grpc_queue_->MakeTag([flow](bool ok) {
if (!ok) {
StartUpstreamFinish(flow, Status::OK);
StartUpstreamFinish(flow);
return;
}
StartDownstreamWriteMessage(flow);
Expand Down Expand Up @@ -392,8 +392,7 @@ void ProxyFlow::StartDownstreamWriteMessage(std::shared_ptr<ProxyFlow> flow) {
});
}

void ProxyFlow::StartUpstreamFinish(std::shared_ptr<ProxyFlow> flow,
Status status) {
void ProxyFlow::StartUpstreamFinish(std::shared_ptr<ProxyFlow> flow) {
{
std::lock_guard<std::mutex> lock(flow->mu_);
if (flow->started_upstream_finish_) {
Expand All @@ -404,7 +403,7 @@ void ProxyFlow::StartUpstreamFinish(std::shared_ptr<ProxyFlow> flow,
flow->upstream_reader_writer_->Finish(
&flow->status_from_upstream_,
flow->async_grpc_queue_->MakeTag(
[flow, status](bool ok) { StartDownstreamFinish(flow, status); }));
[flow](bool ok) { StartDownstreamFinish(flow, Status::OK); }));
}

void ProxyFlow::StartDownstreamFinish(std::shared_ptr<ProxyFlow> flow,
Expand Down
3 changes: 1 addition & 2 deletions src/grpc/proxy_flow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ class ProxyFlow {
std::shared_ptr<ProxyFlow> flow);
static void StartUpstreamReadMessage(std::shared_ptr<ProxyFlow> flow);
static void StartDownstreamWriteMessage(std::shared_ptr<ProxyFlow> flow);
static void StartUpstreamFinish(std::shared_ptr<ProxyFlow> flow,
utils::Status status);
static void StartUpstreamFinish(std::shared_ptr<ProxyFlow> flow);
static void StartDownstreamFinish(std::shared_ptr<ProxyFlow> flow,
utils::Status status);

Expand Down
5 changes: 2 additions & 3 deletions src/nginx/t/grpc_interop_cancel.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ my $ServiceControlPort = ApiManager::pick_port();
my $GrpcBackendPort = ApiManager::pick_port();
my $HttpBackendPort = ApiManager::pick_port();

my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(4);
my $t = Test::Nginx->new()->has(qw/http proxy/)->plan(5);

$t->write_file(
'service.pb.txt',
Expand Down Expand Up @@ -85,8 +85,7 @@ is($t->waitforsocket("127.0.0.1:${Http2NginxPort}"), 1, 'Nginx socket ready.');

################################################################################
my @test_cases = (
# Temporary disabled per b/35314304
# 'cancel_after_begin',
'cancel_after_begin',
'cancel_after_first_response',
);

Expand Down