Skip to content

add S3 client knobs + split in‑flight limits (#29541) #29969

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
xyliganSereja merged 2 commits into from
Dec 2, 2025
Merged

add S3 client knobs + split in‑flight limits (#29541) #29969

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
b7ad1eb
add S3 client knobs + split in‑flight limits (#29541)
xyliganSereja Nov 27, 2025
2c7b66e
deleted someone else code
Dec 2, 2025
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 @@ -41,6 +41,7 @@ import "ydb/core/protos/nbs/blockstore.proto";
import "ydb/library/actors/protos/interconnect.proto";
import "yql/essentials/core/file_storage/proto/file_storage.proto";
import "yql/essentials/providers/common/proto/gateways_config.proto";
import "ydb/core/protos/s3_settings.proto";

package NKikimrConfig;
option java_package = "ru.yandex.kikimr.proto";
Expand Down Expand Up @@ -2141,6 +2142,7 @@ message TColumnShardConfig {
optional uint64 BadPortionsLimit = 52;
optional bool CombineChunksInResult = 54 [default = true];
optional bool EnableParallelCompaction = 56 [default = true];
optional NKikimrSchemeOp.TS3Settings S3Client = 58;
}

message TSchemeShardConfig {
Expand Down
7 changes: 7 additions & 0 deletions ydb/core/tx/tiering/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "common.h"
#include "manager.h"

#include <ydb/core/base/appdata.h>
#include <ydb/core/protos/config.pb.h>
#include <ydb/core/tx/columnshard/columnshard_private_events.h>
#include <ydb/core/tx/tiering/fetcher.h>
#include <ydb/core/tx/tiering/tier/identifier.h>
Expand Down Expand Up @@ -78,11 +80,16 @@ class TTiersManager::TActor: public TActorBootstrapped<TTiersManager::TActor> {
ResetRetryState(tierId);
if (description.GetSelf().GetPathType() == NKikimrSchemeOp::EPathTypeExternalDataSource) {
NTiers::TTierConfig tier;
if (HasAppData() && AppDataVerified().ColumnShardConfig.HasS3Client()) {
tier = NTiers::TTierConfig(AppDataVerified().ColumnShardConfig.GetS3Client());
}

if (const auto status = tier.DeserializeFromProto(description.GetExternalDataSourceDescription()); status.IsFail()) {
AFL_WARN(NKikimrServices::TX_TIERING)("event", "fetched_invalid_tier_settings")("error", status.GetErrorMessage());
Owner->UpdateTierConfig(std::nullopt, tierId);
return;
}

Owner->UpdateTierConfig(tier, tierId);
} else {
AFL_WARN(NKikimrServices::TX_TIERING)("error", "invalid_object_type")("type", static_cast<ui64>(description.GetSelf().GetPathType()))("path", tierId.GetConfigPath());
Expand Down
4 changes: 4 additions & 0 deletions ydb/core/tx/tiering/tier/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ class TTierConfig {
, Compression(compression) {
}

explicit TTierConfig(const TTierProto& config)
: ProtoConfig(config) {
}

TConclusionStatus DeserializeFromProto(const NKikimrSchemeOp::TExternalDataSourceDescription& proto);

NJson::TJsonValue SerializeConfigToJson() const;
Expand Down
Loading