postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-16 03:12:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Skip external snapshot copy if path not provided.

Browse Source
This commit is contained in:
Kishore Nallan 2024-11-10 20:50:56 +05:30
parent 26f37f9fdf
commit a05b046d1d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core_api.cpp
View File

@ -2146,11 +2146,7 @@ bool post_snapshot(const std::shared_ptr<http_req>& req, const std::shared_ptr<h
res->content_type_header = "application/json";
if(req->params.count(SNAPSHOT_PATH) == 0) {
req->last_chunk_aggregate = true;
res->final = true;
res->set_400(std::string("Parameter `") + SNAPSHOT_PATH + "` is required.");
stream_response(req, res);
return false;
req->params[SNAPSHOT_PATH] = "";
}
server->do_snapshot(req->params[SNAPSHOT_PATH], req, res);

14
src/raft_server.cpp
View File

@ -534,11 +534,11 @@ void* ReplicationState::save_snapshot(void* arg) {
bool meta_copied = butil::CopyDirectory(src_meta_dir, dest_state_dir, true);
sa->replication_state->ext_snapshot_succeeded = snapshot_copied && meta_copied;
// notify on demand closure that external snapshotting is done
sa->replication_state->notify();
}
// notify on demand closure that external snapshotting is done
sa->replication_state->notify();
// NOTE: *must* do a dummy write here since snapshots cannot be triggered if no write has happened since the
// last snapshot. By doing a dummy write right after a snapshot, we ensure that this can never be the case.
sa->replication_state->do_dummy_write();
@ -894,7 +894,8 @@ void ReplicationState::do_snapshot(const std::string& snapshot_path, const std::
return ;
}
LOG(INFO) << "Triggering an on demand snapshot...";
LOG(INFO) << "Triggering an on demand snapshot"
<< (!snapshot_path.empty() ? " with external snapshot path..." : "...");
thread_pool->enqueue([&snapshot_path, req, res, this]() {
OnDemandSnapshotClosure* snapshot_closure = new OnDemandSnapshotClosure(this, req, res);
@ -1163,6 +1164,9 @@ void OnDemandSnapshotClosure::Run() {
std::unique_ptr<OnDemandSnapshotClosure> self_guard(this);
replication_state->wait(); // until on demand snapshotting completes
auto ext_snapshot_path = replication_state->get_ext_snapshot_path();
replication_state->set_ext_snapshot_path("");
req->last_chunk_aggregate = true;
@ -1171,7 +1175,7 @@ void OnDemandSnapshotClosure::Run() {
nlohmann::json response;
uint32_t status_code;
if(status().ok() && replication_state->get_ext_snapshot_succeeded()) {
if(status().ok() && (ext_snapshot_path.empty() || replication_state->get_ext_snapshot_succeeded())) {
LOG(INFO) << "On demand snapshot succeeded!";
status_code = 201;
response["success"] = true;