Skip to content
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.

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

Disagg: Fix the issue that lifetime of read-snapshots in WN may be longer than expected (#9297) #9316

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions dbms/src/Flash/Disaggregated/WNEstablishDisaggTaskHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ void WNEstablishDisaggTaskHandler::execute(disaggregated::EstablishDisaggTaskRes
response->add_tables(
Serializer::serializePhysicalTable(snap, task_id, mem_tracker_wrapper, need_mem_data).SerializeAsString());
});

// Release SegmentReadTasks that do not have ColumnFileTiny and ColumnFileInMemory
// because these tasks will never call FetchDisaggPages.
auto to_release_tasks = snap->releaseNoNeedFetchTasks();
if (!to_release_tasks.empty())
LOG_INFO(log, "Release no need fetch tasks: count={} segments={}", to_release_tasks.size(), to_release_tasks);
snaps->unregisterSnapshotIfEmpty(task_id);
}

} // namespace DB
4 changes: 0 additions & 4 deletions dbms/src/Flash/Disaggregated/WNFetchPagesStreamWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <Common/Exception.h>
#include <Common/MemoryTracker.h>
#include <Common/Stopwatch.h>
#include <Flash/Coprocessor/CHBlockChunkCodec.h>
#include <Flash/Disaggregated/WNFetchPagesStreamWriter.h>
#include <Flash/Mpp/TrackedMppDataPacket.h>
#include <Interpreters/Settings.h>
Expand All @@ -29,10 +28,7 @@
#include <Storages/DeltaMerge/Segment.h>
#include <Storages/Page/PageUtil.h>
#include <common/logger_useful.h>
#include <kvproto/mpp.pb.h>
#include <tipb/expression.pb.h>

#include <ext/scope_guard.h>
#include <memory>
#include <tuple>

Expand Down
2 changes: 0 additions & 2 deletions dbms/src/Flash/Disaggregated/WNFetchPagesStreamWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ namespace DB

struct Settings;

using SyncPagePacketWriter = grpc::ServerWriter<disaggregated::PagesPacket>;

class WNFetchPagesStreamWriter;
using WNFetchPagesStreamWriterPtr = std::unique_ptr<WNFetchPagesStreamWriter>;

Expand Down
25 changes: 25 additions & 0 deletions dbms/src/Storages/DeltaMerge/Remote/DisaggSnapshot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,15 @@ bool DisaggReadSnapshot::empty() const
return true;
}

SegmentReadTasks DisaggReadSnapshot::releaseNoNeedFetchTasks()
{
SegmentReadTasks to_release_tasks;
std::unique_lock lock(mtx);
for (auto & [table_id, table_snap] : table_snapshots)
table_snap->releaseNoNeedFetchTasks(to_release_tasks);
return to_release_tasks;
}

DisaggPhysicalTableReadSnapshot::DisaggPhysicalTableReadSnapshot(
KeyspaceTableID ks_table_id_,
SegmentReadTasks && tasks_)
Expand All @@ -95,4 +104,20 @@ SegmentReadTaskPtr DisaggPhysicalTableReadSnapshot::popTask(const UInt64 segment
return nullptr;
}

void DisaggPhysicalTableReadSnapshot::releaseNoNeedFetchTasks(SegmentReadTasks & to_release_tasks)
{
std::unique_lock lock(mtx);
for (auto itr = tasks.begin(); itr != tasks.end();)
{
if (itr->second->hasColumnFileToFetch())
{
++itr;
}
else
{
to_release_tasks.push_back(itr->second);
itr = tasks.erase(itr);
}
}
}
} // namespace DB::DM::Remote
4 changes: 4 additions & 0 deletions dbms/src/Storages/DeltaMerge/Remote/DisaggSnapshot.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ class DisaggReadSnapshot

bool empty() const;

SegmentReadTasks releaseNoNeedFetchTasks();

DISALLOW_COPY(DisaggReadSnapshot);

private:
Expand All @@ -104,6 +106,8 @@ class DisaggPhysicalTableReadSnapshot
return tasks.empty();
}

void releaseNoNeedFetchTasks(SegmentReadTasks & to_release_tasks);

DISALLOW_COPY(DisaggPhysicalTableReadSnapshot);

public:
Expand Down
57 changes: 43 additions & 14 deletions dbms/src/Storages/DeltaMerge/SegmentReadTask.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ void SegmentReadTask::fetchPages()
{
return;
}
// Don't need to fetch ColumnFileTiny and ColumnFileInMemory.
if (extra_remote_info->remote_page_ids.empty() && !needFetchMemTableSet())
{
LOG_DEBUG(read_snapshot->log, "Neither ColumnFileTiny or ColumnFileInMemory need to be fetched from WN.");
Expand All @@ -337,7 +338,6 @@ void SegmentReadTask::fetchPages()

Stopwatch watch_work{CLOCK_MONOTONIC_COARSE};
SCOPE_EXIT({
// This metric is per-segment.
GET_METRIC(tiflash_disaggregated_breakdown_duration_seconds, type_worker_fetch_page)
.Observe(watch_work.elapsedSeconds());
});
Expand Down Expand Up @@ -516,6 +516,10 @@ void SegmentReadTask::checkMemTableSetReady() const
bool SegmentReadTask::needFetchMemTableSet() const
{
// Check if any object of ColumnFileInMemory does not contain data.
// In v7.5, data of ColumnFileInMemory will be returned by EstablishDisaggTask,
// so cf_in_mem->getCache() will NOT be null after deserializeSegment.
// Since 8.1, data of ColumnFileInMemory need to fetch by calling `FetchDisaggPages`,
// cf_in_mem->getCache() will be null after deserializeSegment.
for (const auto & cf : read_snapshot->delta->getMemTableSetSnapshot()->getColumnFiles())
{
if (auto * cf_in_mem = cf->tryToInMemoryFile(); cf_in_mem)
Expand All @@ -542,10 +546,7 @@ static void checkPageID(

void SegmentReadTask::doFetchPages(const disaggregated::FetchDisaggPagesRequest & request)
{
// No page and memtable need to be fetched.
if (request.page_ids_size() == 0 && !needFetchMemTableSet())
return;

// No matter all delta data is cached or not, call FetchDisaggPages to release snapshot in WN.
const auto * cluster = dm_context->global_context.getTMTContext().getKVCluster();
pingcap::kv::RpcCall<pingcap::kv::RPC_NAME(FetchDisaggPages)> rpc(
cluster->rpc_client,
Expand All @@ -564,6 +565,13 @@ void SegmentReadTask::doFetchPages(const disaggregated::FetchDisaggPagesRequest
}
});

// All delta data is cached.
if (request.page_ids_size() == 0 && !needFetchMemTableSet())
{
finishPagesPacketStream(stream_resp);
return;
}

doFetchPagesImpl(
[&stream_resp, this](disaggregated::PagesPacket & packet) {
if (stream_resp->Read(&packet))
Expand All @@ -572,15 +580,7 @@ void SegmentReadTask::doFetchPages(const disaggregated::FetchDisaggPagesRequest
}
else
{
auto status = stream_resp->Finish();
stream_resp.reset(); // Reset to avoid calling `Finish()` repeatedly.
RUNTIME_CHECK_MSG(
status.ok(),
"Failed to fetch all pages for {}, status={}, message={}, wn_address={}",
*this,
static_cast<int>(status.error_code()),
status.error_message(),
extra_remote_info->store_address);
finishPagesPacketStream(stream_resp);
return false;
}
},
Expand Down Expand Up @@ -770,4 +770,33 @@ GlobalSegmentID SegmentReadTask::getGlobalSegmentID() const
};
}

void SegmentReadTask::finishPagesPacketStream(
std::unique_ptr<grpc::ClientReader<disaggregated::PagesPacket>> & stream_resp)
{
if unlikely (stream_resp == nullptr)
return;

auto status = stream_resp->Finish();
stream_resp.reset(); // Reset to avoid calling `Finish()` repeatedly.
RUNTIME_CHECK_MSG(
status.ok(),
"Failed to fetch all pages for {}, status={}, message={}, wn_address={}",
*this,
static_cast<int>(status.error_code()),
status.error_message(),
extra_remote_info->store_address);
}

bool SegmentReadTask::hasColumnFileToFetch() const
{
auto need_to_fetch = [](const ColumnFilePtr & cf) {
// Only ColumnFileMemory and ColumnFileTiny need too fetch.
// ColumnFileDeleteRange and ColumnFileBig do not need to fetch.
return cf->isInMemoryFile() || cf->isTinyFile();
};
const auto & mem_cfs = read_snapshot->delta->getMemTableSetSnapshot()->getColumnFiles();
const auto & persisted_cfs = read_snapshot->delta->getPersistedFileSetSnapshot()->getColumnFiles();
return std::any_of(mem_cfs.cbegin(), mem_cfs.cend(), need_to_fetch)
|| std::any_of(persisted_cfs.cbegin(), persisted_cfs.cend(), need_to_fetch);
}
} // namespace DB::DM
7 changes: 6 additions & 1 deletion dbms/src/Storages/DeltaMerge/SegmentReadTask.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ struct SegmentReadTask
return input_stream;
}

// WN calls hasColumnFileToFetch to check whether a SegmentReadTask need to fetch column files from it
bool hasColumnFileToFetch() const;

String toString() const;

#ifndef DBMS_PUBLIC_GTEST
Expand Down Expand Up @@ -145,6 +148,8 @@ struct SegmentReadTask
ReadMode read_mode,
size_t expected_block_size);

void finishPagesPacketStream(std::unique_ptr<grpc::ClientReader<disaggregated::PagesPacket>> & stream);

BlockInputStreamPtr input_stream;
};

Expand All @@ -162,7 +167,7 @@ struct fmt::formatter<DB::DM::SegmentReadTask>
auto format(const DB::DM::SegmentReadTask & t, FormatContext & ctx) const
{
return fmt::format_to(ctx.out(), "{}", t.toString());
};
}
};

template <>
Expand Down