diff --git a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientBidiReactorBase.h b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientBidiReactorBase.h --- a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientBidiReactorBase.h +++ b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientBidiReactorBase.h @@ -13,7 +13,7 @@ protected: Request request; - grpc::Status status; + grpc::Status status = grpc::Status::OK; public: grpc::ClientContext context; @@ -28,6 +28,7 @@ virtual std::unique_ptr prepareRequest( Request &request, std::shared_ptr previousResponse) = 0; + virtual void validate(){}; virtual void doneCallback(){}; virtual void terminateCallback(){}; }; @@ -51,15 +52,22 @@ template void ClientBidiReactorBase::terminate( const grpc::Status &status) { - this->terminateCallback(); - if (this->done) { - return; + if (this->status.ok()) { + this->status = status; } if (!this->status.ok()) { std::cout << "error: " << this->status.error_message() << std::endl; } + if (this->done) { + return; + } + this->terminateCallback(); + try { + this->validate(); + } catch (std::runtime_error &e) { + this->status = grpc::Status(grpc::StatusCode::INTERNAL, e.what()); + } this->StartWritesDone(); - this->status = status; this->done = true; } @@ -79,7 +87,10 @@ template void ClientBidiReactorBase::OnReadDone(bool ok) { if (!ok) { - this->terminate(grpc::Status(grpc::StatusCode::UNKNOWN, "read error")); + // Ending a connection on the other side results in the `ok` flag being set + // to false. It makes it impossible to detect a failure based just on the + // flag. We should manually check if the data we received is valid + this->terminate(grpc::Status::OK); return; } this->nextWrite(); diff --git a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientReadReactorBase.h b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientReadReactorBase.h --- a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientReadReactorBase.h +++ b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientReadReactorBase.h @@ -7,7 +7,7 @@ template class ClientReadReactorBase : public grpc::ClientReadReactor { Response response; - grpc::Status status; + grpc::Status status = grpc::Status::OK; bool done = false; bool initialized = false; @@ -24,6 +24,7 @@ virtual std::unique_ptr readResponse(const Response &response) = 0; + virtual void validate(){}; virtual void doneCallback(){}; virtual void terminateCallback(){}; }; @@ -31,14 +32,21 @@ template void ClientReadReactorBase::terminate( const grpc::Status &status) { - this->terminateCallback(); - if (this->done) { - return; + if (this->status.ok()) { + this->status = status; } if (!this->status.ok()) { std::cout << "error: " << this->status.error_message() << std::endl; } - this->status = status; + if (this->done) { + return; + } + this->terminateCallback(); + try { + this->validate(); + } catch (std::runtime_error &e) { + this->status = grpc::Status(grpc::StatusCode::INTERNAL, e.what()); + } this->done = true; } @@ -54,7 +62,10 @@ template void ClientReadReactorBase::OnReadDone(bool ok) { if (!ok) { - this->terminate(grpc::Status(grpc::StatusCode::UNKNOWN, "read error")); + // Ending a connection on the other side results in the `ok` flag being set + // to false. It makes it impossible to detect a failure based just on the + // flag. We should manually check if the data we received is valid + this->terminate(grpc::Status::OK); return; } std::unique_ptr status = this->readResponse(this->response); diff --git a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientWriteReactorBase.h b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientWriteReactorBase.h --- a/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientWriteReactorBase.h +++ b/services/backup/docker-server/contents/server/src/Reactors/client/base-reactors/ClientWriteReactorBase.h @@ -6,7 +6,7 @@ template class ClientWriteReactorBase : public grpc::ClientWriteReactor { - grpc::Status status; + grpc::Status status = grpc::Status::OK; bool done = false; bool initialized = 0; Request request; @@ -22,6 +22,7 @@ void OnDone(const grpc::Status &status) override; virtual std::unique_ptr prepareRequest(Request &request) = 0; + virtual void validate(){}; virtual void doneCallback(){}; virtual void terminateCallback(){}; }; @@ -53,14 +54,21 @@ template void ClientWriteReactorBase::terminate( const grpc::Status &status) { - this->terminateCallback(); - if (this->done) { - return; + if (this->status.ok()) { + this->status = status; } if (!this->status.ok()) { std::cout << "error: " << this->status.error_message() << std::endl; } - this->status = status; + if (this->done) { + return; + } + this->terminateCallback(); + try { + this->validate(); + } catch (std::runtime_error &e) { + this->status = grpc::Status(grpc::StatusCode::INTERNAL, e.what()); + } this->done = true; this->StartWritesDone(); }