Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3492074
D4323.id14347.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D4323.id14347.diff
View Options
diff --git a/services/backup/src/BackupServiceImpl.cpp b/services/backup/src/BackupServiceImpl.cpp
--- a/services/backup/src/BackupServiceImpl.cpp
+++ b/services/backup/src/BackupServiceImpl.cpp
@@ -1,7 +1,7 @@
#include "BackupServiceImpl.h"
+#include "AddAttachmentsUtility.h"
#include "CreateNewBackupReactor.h"
-#include "DatabaseManager.h"
#include "PullBackupReactor.h"
#include "RecoverBackupKeyReactor.h"
#include "SendLogReactor.h"
@@ -52,40 +52,8 @@
grpc::CallbackServerContext *context,
const backup::AddAttachmentsRequest *request,
google::protobuf::Empty *response) {
- grpc::Status status = grpc::Status::OK;
- std::string userID = request->userid();
- std::string backupID = request->backupid();
- std::string logID = request->logid();
- const std::string holders = request->holders();
- try {
- if (userID.empty()) {
- throw std::runtime_error("user id required but not provided");
- }
- if (backupID.empty()) {
- throw std::runtime_error("backup id required but not provided");
- }
- if (holders.empty()) {
- throw std::runtime_error("holders required but not provided");
- }
-
- if (logID.empty()) {
- // add these attachments to backup
- std::shared_ptr<database::BackupItem> backupItem =
- database::DatabaseManager::getInstance().findBackupItem(
- userID, backupID);
- backupItem->addAttachmentHolders(holders);
- database::DatabaseManager::getInstance().putBackupItem(*backupItem);
- } else {
- // add these attachments to log
- std::shared_ptr<database::LogItem> logItem =
- database::DatabaseManager::getInstance().findLogItem(backupID, logID);
- logItem->addAttachmentHolders(holders);
- database::DatabaseManager::getInstance().putLogItem(*logItem);
- }
- } catch (std::runtime_error &e) {
- std::cout << "error: " << e.what() << std::endl;
- status = grpc::Status(grpc::StatusCode::INTERNAL, e.what());
- }
+ grpc::Status status =
+ reactor::AddAttachmentsUtility().processRequest(request);
auto *reactor = context->DefaultReactor();
reactor->Finish(status);
return reactor;
diff --git a/services/backup/src/Reactors/server/AddAttachmentsUtility.h b/services/backup/src/Reactors/server/AddAttachmentsUtility.h
new file mode 100644
--- /dev/null
+++ b/services/backup/src/Reactors/server/AddAttachmentsUtility.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "LogItem.h"
+
+#include "../_generated/backup.grpc.pb.h"
+#include "../_generated/backup.pb.h"
+
+#include <grpcpp/grpcpp.h>
+#include <memory>
+
+namespace comm {
+namespace network {
+namespace reactor {
+
+class AddAttachmentsUtility {
+ std::shared_ptr<database::LogItem> moveToS3(std::shared_ptr<database::LogItem> logItem);
+public:
+ grpc::Status processRequest(const backup::AddAttachmentsRequest *request);
+};
+
+} // namespace reactor
+} // namespace network
+} // namespace comm
diff --git a/services/backup/src/Reactors/server/AddAttachmentsUtility.cpp b/services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
new file mode 100644
--- /dev/null
+++ b/services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
@@ -0,0 +1,94 @@
+#include "AddAttachmentsUtility.h"
+
+#include "BackupItem.h"
+#include "BlobPutClientReactor.h"
+#include "Constants.h"
+#include "DatabaseManager.h"
+#include "ServiceBlobClient.h"
+#include "Tools.h"
+
+namespace comm {
+namespace network {
+namespace reactor {
+
+grpc::Status AddAttachmentsUtility::processRequest(
+ const backup::AddAttachmentsRequest *request) {
+ grpc::Status status = grpc::Status::OK;
+ std::string userID = request->userid();
+ std::string backupID = request->backupid();
+ std::string logID = request->logid();
+ const std::string holders = request->holders();
+ try {
+ if (userID.empty()) {
+ throw std::runtime_error("user id required but not provided");
+ }
+ if (backupID.empty()) {
+ throw std::runtime_error("backup id required but not provided");
+ }
+ if (holders.empty()) {
+ throw std::runtime_error("holders required but not provided");
+ }
+
+ if (logID.empty()) {
+ // add these attachments to backup
+ std::shared_ptr<database::BackupItem> backupItem =
+ database::DatabaseManager::getInstance().findBackupItem(
+ userID, backupID);
+ backupItem->addAttachmentHolders(holders);
+ database::DatabaseManager::getInstance().putBackupItem(*backupItem);
+ } else {
+ // add these attachments to log
+ std::shared_ptr<database::LogItem> logItem =
+ database::DatabaseManager::getInstance().findLogItem(backupID, logID);
+ logItem->addAttachmentHolders(holders);
+ if (!logItem->getPersistedInBlob() &&
+ database::LogItem::getItemSize(logItem.get()) >
+ LOG_DATA_SIZE_DATABASE_LIMIT) {
+ bool old = logItem->getPersistedInBlob();
+ logItem = this->moveToS3(logItem);
+ }
+ database::DatabaseManager::getInstance().putLogItem(*logItem);
+ }
+ } catch (std::runtime_error &e) {
+ std::cout << "error: " << e.what() << std::endl;
+ status = grpc::Status(grpc::StatusCode::INTERNAL, e.what());
+ }
+ return status;
+}
+
+std::shared_ptr<database::LogItem> AddAttachmentsUtility::moveToS3(
+ std::shared_ptr<database::LogItem> logItem) {
+ std::string holder = tools::generateHolder(
+ logItem->getDataHash(), logItem->getBackupID(), logItem->getLogID());
+ std::string data = std::move(logItem->getValue());
+ std::shared_ptr<database::LogItem> newLogItem = std::make_shared<database::LogItem>(
+ logItem->getBackupID(),
+ logItem->getLogID(),
+ true,
+ holder,
+ logItem->getAttachmentHolders(),
+ logItem->getDataHash());
+ // put into S3
+ std::condition_variable blobPutDoneCV;
+ std::mutex blobPutDoneCVMutex;
+ std::shared_ptr<reactor::BlobPutClientReactor> putReactor =
+ std::make_shared<reactor::BlobPutClientReactor>(
+ holder, newLogItem->getDataHash(), &blobPutDoneCV);
+ ServiceBlobClient().put(putReactor);
+ std::unique_lock<std::mutex> lockPut(blobPutDoneCVMutex);
+ putReactor->scheduleSendingDataChunk(
+ std::make_unique<std::string>(std::move(data)));
+ putReactor->scheduleSendingDataChunk(std::make_unique<std::string>(""));
+ if (putReactor->getStatusHolder()->state != reactor::ReactorState::DONE) {
+ blobPutDoneCV.wait(lockPut);
+ }
+ if (!putReactor->getStatusHolder()->getStatus().ok()) {
+ throw std::runtime_error(
+ putReactor->getStatusHolder()->getStatus().error_message());
+ }
+ return newLogItem;
+}
+
+} // namespace reactor
+} // namespace network
+} // namespace comm
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Dec 19, 10:02 PM (20 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2678639
Default Alt Text
D4323.id14347.diff (6 KB)
Attached To
Mode
D4323: [services] Backup - Update add attachments logic
Attached
Detach File
Event Timeline
Log In to Comment