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

GrpcConnection: Re-use subscription thread #2651

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GrpcConnection: Re-use subscription thread #2651

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions client/thin-replica-client/include/client/thin-replica-client/grpc_connection.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "assertUtils.hpp"
#include "thin_replica.grpc.pb.h"
#include "replica_state_snapshot.grpc.pb.h"
#include "thread_pool.hpp"
#include "Logger.hpp"

using namespace std::chrono_literals;
Expand Down Expand Up @@ -215,6 +216,11 @@ class GrpcConnection {
std::unique_ptr<com::vmware::concord::thin_replica::ThinReplica::StubInterface> trc_stub_;
std::unique_ptr<vmware::concord::replicastatesnapshot::ReplicaStateSnapshotService::StubInterface> rss_stub_;

// A gRPC connection will either have an active hash-, data stream or no subscription at all. Reads on an active
// subscription stream have to be serialized and hence either we use multiple threads and a lock or start a single
// thread only.
concord::util::ThreadPool subscription_pool_{1};

// TRS connection config
std::unique_ptr<GrpcConnectionConfig> config_;

Expand Down
8 changes: 4 additions & 4 deletions client/thin-replica-client/src/grpc_connection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ GrpcConnection::Result GrpcConnection::openDataStream(const SubscriptionRequest&
data_context_.reset(new grpc::ClientContext());
data_context_->AddMetadata("client_id", client_id_);

auto stream = async(launch::async, [this, &request] {
auto stream = subscription_pool_.async([this, &request] {
ReadLock read_lock(channel_mutex_);
return trc_stub_->SubscribeToUpdates(data_context_.get(), request);
});
Expand Down Expand Up @@ -169,7 +169,7 @@ GrpcConnection::Result GrpcConnection::readData(Data* data) {
ConcordAssertNE(data_stream_, nullptr);
ConcordAssertNE(data_context_, nullptr);

auto result = async(launch::async, [this, data] { return data_stream_->Read(data); });
auto result = subscription_pool_.async([this, data] { return data_stream_->Read(data); });
auto status = result.wait_for(data_timeout_);
if (status == future_status::timeout || status == future_status::deferred) {
data_context_->TryCancel();
Expand Down Expand Up @@ -329,7 +329,7 @@ GrpcConnection::Result GrpcConnection::openHashStream(SubscriptionRequest& reque
hash_context_.reset(new grpc::ClientContext());
hash_context_->AddMetadata("client_id", client_id_);

auto stream = async(launch::async, [this, &request] {
auto stream = subscription_pool_.async([this, &request] {
ReadLock read_lock(channel_mutex_);
return trc_stub_->SubscribeToUpdateHashes(hash_context_.get(), request);
});
Expand Down Expand Up @@ -375,7 +375,7 @@ GrpcConnection::Result GrpcConnection::readHash(Hash* hash) {
ConcordAssertNE(hash_stream_, nullptr);
ConcordAssertNE(hash_context_, nullptr);

auto result = async(launch::async, [this, hash] { return hash_stream_->Read(hash); });
auto result = subscription_pool_.async([this, hash] { return hash_stream_->Read(hash); });
auto status = result.wait_for(hash_timeout_);
if (status == future_status::timeout || status == future_status::deferred) {
hash_context_->TryCancel();
Expand Down