Skip to content

configure max in flight and reduce by default #6158

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
merged 2 commits into from
Jul 2, 2024
Merged

configure max in flight and reduce by default #6158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c841f1
configure max in flight and reduce by default
ivanmorozov333 Jul 2, 2024
e2cb963
add proto
ivanmorozov333 Jul 2, 2024
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
2 changes: 2 additions & 0 deletions ydb/core/protos/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,8 @@ message TColumnShardConfig {
optional string Description = 2;
}
repeated TRepairInfo Repairs = 15;

optional uint32 MaxInFlightIntervalsOnRequest = 16;
}

message TSchemeShardConfig {
Expand Down
14 changes: 12 additions & 2 deletions ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ void TScanHead::OnIntervalResult(const std::optional<NArrow::TShardedRecordBatch
std::unique_ptr<NArrow::NMerger::TMergePartialStream>&& merger, const ui32 intervalIdx, TPlainReadData& reader) {
if (Context->GetReadMetadata()->Limit && (!newBatch || newBatch->GetRecordsCount() == 0) && InFlightLimit < 1000) {
if (++ZeroCount == std::max<ui64>(16, InFlightLimit)) {
InFlightLimit *= 2;
InFlightLimit = std::max<ui32>(MaxInFlight, InFlightLimit * 2);
ZeroCount = 0;
}
} else {
Expand Down Expand Up @@ -97,7 +97,17 @@ TConclusionStatus TScanHead::Start() {
TScanHead::TScanHead(std::deque<std::shared_ptr<IDataSource>>&& sources, const std::shared_ptr<TSpecialReadContext>& context)
: Context(context)
{
InFlightLimit = Context->GetReadMetadata()->Limit ? 1 : Max<ui32>();
if (!HasAppData() || !AppDataVerified().ColumnShardConfig.HasMaxInFlightIntervalsOnRequest()) {
MaxInFlight = 256;
} else {
MaxInFlight = AppDataVerified().ColumnShardConfig.GetMaxInFlightIntervalsOnRequest();
}

if (Context->GetReadMetadata()->Limit) {
InFlightLimit = 1;
} else {
InFlightLimit = MaxInFlight;
}
while (sources.size()) {
auto source = sources.front();
BorderPoints[source->GetStart()].AddStart(source);
Expand Down
1 change: 1 addition & 0 deletions ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/scanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class TScanHead {
ui32 SegmentIdxCounter = 0;
std::vector<TIntervalStat> IntervalStats;
ui64 InFlightLimit = 1;
ui64 MaxInFlight = 256;
ui64 ZeroCount = 0;
bool AbortFlag = false;
void DrainSources();
Expand Down