Skip to content

23.3 Backport of #52623 - Fix stress test: check if storage shutdown before we operate MergeTreeDeduplicationLog #366

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
Enmk merged 1 commit into from
Feb 9, 2024
Merged

23.3 Backport of #52623 - Fix stress test: check if storage shutdown before we operate MergeTreeDeduplicationLog #366

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
21 changes: 19 additions & 2 deletions src/Storages/MergeTree/MergeTreeDeduplicationLog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@
#include <Disks/WriteMode.h>
#include <Disks/IDisk.h>

#include <Common/Exception.h>

namespace DB
{

namespace ErrorCodes
{
extern const int ABORTED;
}

namespace
{

Expand Down Expand Up @@ -227,7 +234,12 @@ std::pair<MergeTreePartInfo, bool> MergeTreeDeduplicationLog::addPart(const std:
return std::make_pair(info, false);
}

assert(current_writer != nullptr);
if (stopped)
{
throw Exception(ErrorCodes::ABORTED, "Storage has been shutdown when we add this part.");
}

chassert(current_writer != nullptr);

/// Create new record
MergeTreeDeduplicationLogRecord record;
Expand Down Expand Up @@ -257,7 +269,12 @@ void MergeTreeDeduplicationLog::dropPart(const MergeTreePartInfo & drop_part_inf
if (deduplication_window == 0)
return;

assert(current_writer != nullptr);
if (stopped)
{
throw Exception(ErrorCodes::ABORTED, "Storage has been shutdown when we drop this part.");
}

chassert(current_writer != nullptr);

for (auto itr = deduplication_map.begin(); itr != deduplication_map.end(); /* no increment here, we erasing from map */)
{
Expand Down