Skip to content

[Store] Fix snapshot test eviction race #3813

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

Merged
Aionw merged 1 commit into from
Sep 1, 2026
Merged

[Store] Fix snapshot test eviction race #3813

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
12 changes: 12 additions & 0 deletions mooncake-store/tests/ha/snapshot/master_service_test_for_snapshot_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <iomanip>
#include <map>
#include <memory>
#include <mutex>
#include <sstream>
#include <thread>
#include <unordered_map>
Expand Down Expand Up @@ -165,6 +166,8 @@ class MasterServiceSnapshotTestBase : public ::testing::Test {
// private members
static tl::expected<void, SerializationError> CallPersistState(
MasterService* service, const std::string& snapshot_id) {
std::unique_lock<std::shared_mutex> snapshot_lock(
service->snapshot_mutex_);
// If snapshot_manager_ exists, use it; otherwise create a temporary one
if (service->snapshot_manager_) {
return service->snapshot_manager_->PersistState(snapshot_id);
Expand Down Expand Up @@ -827,6 +830,15 @@ class MasterServiceSnapshotTestBase : public ::testing::Test {
<< "Use 'service_.reset(new MasterService(...))' instead of "
"'std::unique_ptr<MasterService> service_(...)'";

// Freeze the original service before snapshot/restore validation. The
// eviction worker can otherwise mutate replica metadata while the
// snapshot is being serialized, making the post-restore comparison
// compare two different points in time.
service_->eviction_running_ = false;
if (service_->eviction_thread_.joinable()) {
service_->eviction_thread_.join();
}

// Some test configs may not enable snapshot/restore, so the backend
// is not created in the constructor. We create it here for TearDown
// validation.
Expand Down
Loading