Page MenuHomePhabricator
Differential D3179

[services] Blob - Fix logic for primary key
ClosedPublic
Actions

Authored by • karol on Feb 11 2022, 3:43 AM.
Tags
None
Referenced Files
F5895176: D3179.id.diff
Thu, Apr 17, 10:40 AM
F5891765: D3179.id9564.diff
Thu, Apr 17, 7:44 AM
F5890738: D3179.id9712.diff
Thu, Apr 17, 6:30 AM
Unknown Object (File)
Wed, Apr 16, 7:54 PM
Unknown Object (File)
Wed, Apr 16, 1:43 PM
Unknown Object (File)
Thu, Apr 10, 1:17 AM
Unknown Object (File)
Tue, Apr 8, 6:59 PM
Unknown Object (File)
Tue, Apr 8, 6:48 PM
View All Files
Subscribers
• adrian
ashoat
atul
• benschac
tomek

Details

Reviewers
tomek
• max
varun
ashoat
• jim
Commits
rCOMM4823d46d6df2: [services] Blob - Fix logic for primary key
Summary

We want to apply the changes from D3177 to all services.

I'm not sure what's the state of the tunnelbroker service so I created a task for it for now https://linear.app/comm/issue/ENG-728/fix-primary-key-logic-for-tunnelbroker

Depends on D3178

Test Plan
cd services
yarn test-blob-service

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• karol created this revision.Feb 11 2022, 3:43 AM
Herald added subscribers: atul, • adrian, tomek, ashoat. · View Herald TranscriptFeb 11 2022, 3:43 AM
• karol edited the summary of this revision. (Show Details)Feb 11 2022, 3:53 AM
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: tomek, • max, varun.
• karol added a parent revision: D3178: [services] Backup - Reuse remove logic.
Harbormaster completed remote builds in B6747: Diff 9564.Feb 11 2022, 4:04 AM
• karol requested review of this revision.Feb 11 2022, 4:04 AM
tomek requested changes to this revision.Feb 11 2022, 7:56 AM

The comments I added in previous diffs in this stack also apply here, so I'll request changes

This revision now requires changes to proceed.Feb 11 2022, 7:56 AM
• karol mentioned this in D3175: [services] Backup - Add DB operations for Logs.Feb 14 2022, 2:51 AM
• karol added a comment.Feb 14 2022, 5:31 AM

I'm going to wait for a review for D3177 D3178 and apply changes here accordingly then.

• karol added a child revision: D3198: [services] Move folly from Blob to Backup base.Feb 15 2022, 5:21 AM
• karol updated this revision to Diff 9712.Feb 16 2022, 2:02 AM

update

Harbormaster completed remote builds in B6864: Diff 9712.Feb 16 2022, 2:07 AM
tomek accepted this revision.Feb 16 2022, 5:25 AM
This revision is now accepted and ready to land.Feb 16 2022, 5:25 AM
Herald added a reviewer: ashoat. · View Herald TranscriptFeb 16 2022, 5:25 AM
Herald added a subscriber: • benschac. · View Herald Transcript
This revision now requires review to proceed.Feb 16 2022, 5:25 AM
• max accepted this revision.Feb 16 2022, 4:58 PM
ashoat accepted this revision.Feb 21 2022, 11:53 PM
ashoat added a reviewer: • jim.
This revision is now accepted and ready to land.Feb 21 2022, 11:53 PM
Closed by commit rCOMM4823d46d6df2: [services] Blob - Fix logic for primary key (authored by • karol). · Explain WhyMar 4 2022, 4:06 AM
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMM4823d46d6df2: [services] Blob - Fix logic for primary key.

Revision Contents
Changeset List

PathSize
services/
blob/
docker-server/
contents/
server/
src/
DatabaseEntities/
3 lines
8 lines
25 lines
4 lines
8 lines
2 lines
22 lines

Diff 10067

View Options

services/blob/docker-server/contents/server/src/DatabaseEntities/BlobItem.h

#include <grpcpp/grpcpp.h> #include <grpcpp/grpcpp.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace reactor { namespace reactor {
template <class Request, class Response> template <class Request, class Response>
class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> { class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> {
grpc::Status status; grpc::Status status = grpc::Status::OK;
bool done = false; bool done = false;
bool initialized = 0; bool initialized = 0;
Request request; Request request;
public: public:
Response response; Response response;
grpc::ClientContext context; grpc::ClientContext context;
void nextWrite(); void nextWrite();
void OnWriteDone(bool ok) override; void OnWriteDone(bool ok) override;
void terminate(const grpc::Status &status); void terminate(const grpc::Status &status);
bool isDone(); bool isDone();
void OnDone(const grpc::Status &status) override; void OnDone(const grpc::Status &status) override;
virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0; virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0;
virtual void validate(){};
virtual void doneCallback(){}; virtual void doneCallback(){};
virtual void terminateCallback(){}; virtual void terminateCallback(){};
}; };
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::nextWrite() { void ClientWriteReactorBase<Request, Response>::nextWrite() {
this->request = Request(); this->request = Request();
std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request); std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request);
Show All 15 Lines if (!ok) {
return; return;
} }
this->nextWrite(); this->nextWrite();
} }
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::terminate( void ClientWriteReactorBase<Request, Response>::terminate(
const grpc::Status &status) { const grpc::Status &status) {
this->terminateCallback(); if (this->status.ok()) {
if (this->done) { this->status = status;
return;
} }
if (!this->status.ok()) { if (!this->status.ok()) {
std::cout << "error: " << this->status.error_message() << std::endl; 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->done = true;
this->StartWritesDone(); this->StartWritesDone();
} }
template <class Request, class Response> template <class Request, class Response>
bool ClientWriteReactorBase<Request, Response>::isDone() { bool ClientWriteReactorBase<Request, Response>::isDone() {
return this->done; return this->done;
} }
Show All 11 Lines
View Options

services/blob/docker-server/contents/server/src/DatabaseEntities/BlobItem.cpp

#include <grpcpp/grpcpp.h> #include <grpcpp/grpcpp.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace reactor { namespace reactor {
template <class Request, class Response> template <class Request, class Response>
class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> { class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> {
grpc::Status status; grpc::Status status = grpc::Status::OK;
bool done = false; bool done = false;
bool initialized = 0; bool initialized = 0;
Request request; Request request;
public: public:
Response response; Response response;
grpc::ClientContext context; grpc::ClientContext context;
void nextWrite(); void nextWrite();
void OnWriteDone(bool ok) override; void OnWriteDone(bool ok) override;
void terminate(const grpc::Status &status); void terminate(const grpc::Status &status);
bool isDone(); bool isDone();
void OnDone(const grpc::Status &status) override; void OnDone(const grpc::Status &status) override;
virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0; virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0;
virtual void validate(){};
virtual void doneCallback(){}; virtual void doneCallback(){};
virtual void terminateCallback(){}; virtual void terminateCallback(){};
}; };
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::nextWrite() { void ClientWriteReactorBase<Request, Response>::nextWrite() {
this->request = Request(); this->request = Request();
std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request); std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request);
Show All 15 Lines if (!ok) {
return; return;
} }
this->nextWrite(); this->nextWrite();
} }
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::terminate( void ClientWriteReactorBase<Request, Response>::terminate(
const grpc::Status &status) { const grpc::Status &status) {
this->terminateCallback(); if (this->status.ok()) {
if (this->done) { this->status = status;
return;
} }
if (!this->status.ok()) { if (!this->status.ok()) {
std::cout << "error: " << this->status.error_message() << std::endl; 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->done = true;
this->StartWritesDone(); this->StartWritesDone();
} }
template <class Request, class Response> template <class Request, class Response>
bool ClientWriteReactorBase<Request, Response>::isDone() { bool ClientWriteReactorBase<Request, Response>::isDone() {
return this->done; return this->done;
} }
Show All 11 Lines
View Options

services/blob/docker-server/contents/server/src/DatabaseEntities/Item.h

#include <grpcpp/grpcpp.h> #include <grpcpp/grpcpp.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace reactor { namespace reactor {
template <class Request, class Response> template <class Request, class Response>
class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> { class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> {
grpc::Status status; grpc::Status status = grpc::Status::OK;
bool done = false; bool done = false;
bool initialized = 0; bool initialized = 0;
Request request; Request request;
public: public:
Response response; Response response;
grpc::ClientContext context; grpc::ClientContext context;
void nextWrite(); void nextWrite();
void OnWriteDone(bool ok) override; void OnWriteDone(bool ok) override;
void terminate(const grpc::Status &status); void terminate(const grpc::Status &status);
bool isDone(); bool isDone();
void OnDone(const grpc::Status &status) override; void OnDone(const grpc::Status &status) override;
virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0; virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0;
virtual void validate(){};
virtual void doneCallback(){}; virtual void doneCallback(){};
virtual void terminateCallback(){}; virtual void terminateCallback(){};
}; };
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::nextWrite() { void ClientWriteReactorBase<Request, Response>::nextWrite() {
this->request = Request(); this->request = Request();
std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request); std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request);
Show All 15 Lines if (!ok) {
return; return;
} }
this->nextWrite(); this->nextWrite();
} }
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::terminate( void ClientWriteReactorBase<Request, Response>::terminate(
const grpc::Status &status) { const grpc::Status &status) {
this->terminateCallback(); if (this->status.ok()) {
if (this->done) { this->status = status;
return;
} }
if (!this->status.ok()) { if (!this->status.ok()) {
std::cout << "error: " << this->status.error_message() << std::endl; 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->done = true;
this->StartWritesDone(); this->StartWritesDone();
} }
template <class Request, class Response> template <class Request, class Response>
bool ClientWriteReactorBase<Request, Response>::isDone() { bool ClientWriteReactorBase<Request, Response>::isDone() {
return this->done; return this->done;
} }
Show All 11 Lines
View Options

services/blob/docker-server/contents/server/src/DatabaseEntities/ReverseIndexItem.h

#include <grpcpp/grpcpp.h> #include <grpcpp/grpcpp.h>
namespace comm { namespace comm {
namespace network { namespace network {
namespace reactor { namespace reactor {
template <class Request, class Response> template <class Request, class Response>
class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> { class ClientWriteReactorBase : public grpc::ClientWriteReactor<Request> {
grpc::Status status; grpc::Status status = grpc::Status::OK;
bool done = false; bool done = false;
bool initialized = 0; bool initialized = 0;
Request request; Request request;
public: public:
Response response; Response response;
grpc::ClientContext context; grpc::ClientContext context;
void nextWrite(); void nextWrite();
void OnWriteDone(bool ok) override; void OnWriteDone(bool ok) override;
void terminate(const grpc::Status &status); void terminate(const grpc::Status &status);
bool isDone(); bool isDone();
void OnDone(const grpc::Status &status) override; void OnDone(const grpc::Status &status) override;
virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0; virtual std::unique_ptr<grpc::Status> prepareRequest(Request &request) = 0;
virtual void validate(){};
virtual void doneCallback(){}; virtual void doneCallback(){};
virtual void terminateCallback(){}; virtual void terminateCallback(){};
}; };
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::nextWrite() { void ClientWriteReactorBase<Request, Response>::nextWrite() {
this->request = Request(); this->request = Request();
std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request); std::unique_ptr<grpc::Status> status = this->prepareRequest(this->request);
Show All 15 Lines if (!ok) {
return; return;
} }
this->nextWrite(); this->nextWrite();
} }
template <class Request, class Response> template <class Request, class Response>
void ClientWriteReactorBase<Request, Response>::terminate( void ClientWriteReactorBase<Request, Response>::terminate(
const grpc::Status &status) { const grpc::Status &status) {
this->terminateCallback(); if (this->status.ok()) {
if (this->done) { this->status = status;
return;
} }
if (!this->status.ok()) { if (!this->status.ok()) {
std::cout << "error: " << this->status.error_message() << std::endl; 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->done = true;
this->StartWritesDone(); this->StartWritesDone();
} }
template <class Request, class Response> template <class Request, class Response>
bool ClientWriteReactorBase<Request, Response>::isDone() { bool ClientWriteReactorBase<Request, Response>::isDone() {
return this->done; return this->done;
} }
Show All 11 Lines
View Options

services/blob/docker-server/contents/server/src/DatabaseEntities/ReverseIndexItem.cpp

Loading...
View Options

services/blob/docker-server/contents/server/src/DatabaseManager.h

Loading...
View Options

services/blob/docker-server/contents/server/src/DatabaseManager.cpp

Loading...