diff options
| author |  Googler <noreply@google.com> | 2017-10-09 21:33:04 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-10-10 11:22:19 +0200 |
| commit | 61977f4ae57c877fc28be176f36c28642b276eec (patch) | |
| tree | 726a6653826c91f52ca4f2eed842624c0d9f283e | |
| parent | 231391db841b95a4e1bccade87cbd5d7da215b2d (diff) | |
Don't release the client lock while the server executes a command. The
server still doesn't support concurrency, even for commands like 'help',
so there's no benefit from releasing it.
This also improves progress messages. Today the client may print
WARNING: Running Blaze server needs to be killed, because the startup options are different.
and then wait indefinitely while the server finishes processing a
request. With this change, an explanation for the delay is given.
RELNOTES: None.
PiperOrigin-RevId: 171571670
| -rw-r--r-- | src/main/cpp/blaze.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc index 32b21a12e3..96d8e56ccb 100644 --- a/src/main/cpp/blaze.cc +++ b/src/main/cpp/blaze.cc @@ -1670,11 +1670,6 @@ unsigned int GrpcBlazeServer::Communicate() { std::unique_ptr<grpc::ClientReader<command_server::RunResponse>> reader( client_->Run(&context, request)); - // Release the server lock because the gRPC handles concurrent clients just - // fine. Note that this may result in two "waiting for other client" messages - // (one during server startup and one emitted by the server) - blaze::ReleaseLock(&blaze_lock_); - std::thread cancel_thread(&GrpcBlazeServer::CancelThread, this); bool command_id_set = false; bool pipe_broken = false; |