Skip to content

Kafka cdc and auto partitioning yql fixes 24 3 #10757

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
Oct 23, 2024
Merged

Kafka cdc and auto partitioning yql fixes 24 3 #10757

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
ad25c49
Fix kafka cdc read and login without @
niksaveliev Oct 21, 2024
7b51d10
Allow short auto partitioning strategies yql
niksaveliev Oct 22, 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
5 changes: 3 additions & 2 deletions ydb/core/kafka_proxy/actors/kafka_offset_fetch_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,16 @@ struct PartitionOffsets {
class TTopicOffsetActor: public NKikimr::NGRpcProxy::V1::TPQInternalSchemaActor<TTopicOffsetActor,
NKikimr::NGRpcProxy::V1::TLocalRequestBase,
NKikimr::NGRpcProxy::V1::TEvPQProxy::TEvPartitionLocationResponse>,
public NKikimr::NGRpcProxy::V1::TDescribeTopicActorImpl {
public NKikimr::NGRpcProxy::V1::TDescribeTopicActorImpl,
public NKikimr::NGRpcProxy::V1::TCdcStreamCompatible {
using TBase = NKikimr::NGRpcProxy::V1::TPQInternalSchemaActor<TTopicOffsetActor,
NKikimr::NGRpcProxy::V1::TLocalRequestBase,
NKikimr::NGRpcProxy::V1::TEvPQProxy::TEvPartitionLocationResponse>;

public:
TTopicOffsetActor(std::shared_ptr<TSet<TString>> consumers,
const NKikimr::NGRpcProxy::V1::TLocalRequestBase& request,
const TActorId& requester,
const TActorId& requester,
std::shared_ptr<TSet<ui32>> partitions,
const TString& originalTopicName,
const TString& userSID)
Expand Down
9 changes: 5 additions & 4 deletions ydb/core/kafka_proxy/actors/kafka_sasl_auth_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,13 @@ bool TKafkaSaslAuthActor::TryParseAuthDataTo(TKafkaSaslAuthActor::TAuthData& aut
auto password = tokens[2];
size_t atPos = userAndDatabase.rfind('@');
if (atPos == TString::npos) {
SendResponseAndDie(EKafkaErrors::SASL_AUTHENTICATION_FAILED, "Database not provided.", "", ctx);
return false;
authData.UserName = "";
authData.Database = userAndDatabase;
} else {
authData.UserName = userAndDatabase.substr(0, atPos);
authData.Database = userAndDatabase.substr(atPos + 1);
}

authData.UserName = userAndDatabase.substr(0, atPos);
authData.Database = userAndDatabase.substr(atPos + 1);
authData.Password = password;
return true;
}
Expand Down
8 changes: 5 additions & 3 deletions ydb/core/kafka_proxy/actors/kafka_topic_offsets_actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ namespace NKafka {
class TTopicOffsetsActor : public NKikimr::NGRpcProxy::V1::TPQInternalSchemaActor<TTopicOffsetsActor,
TEvKafka::TGetOffsetsRequest,
TEvKafka::TEvTopicOffsetsResponse>
, public NKikimr::NGRpcProxy::V1::TDescribeTopicActorImpl {
, public NKikimr::NGRpcProxy::V1::TDescribeTopicActorImpl
, public NKikimr::NGRpcProxy::V1::TCdcStreamCompatible {

using TBase = TPQInternalSchemaActor<TTopicOffsetsActor,
TEvKafka::TGetOffsetsRequest,
Expand All @@ -30,17 +31,18 @@ using TBase = TPQInternalSchemaActor<TTopicOffsetsActor,
void StateWork(TAutoPtr<IEventHandle>& ev);

void HandleCacheNavigateResponse(NKikimr::TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) override;

virtual void ApplyResponse(TTabletInfo&, NKikimr::TEvPersQueue::TEvReadSessionsInfoResponse::TPtr&,
const TActorContext&) override {
Y_ABORT();
}

bool ApplyResponse(NKikimr::TEvPersQueue::TEvGetPartitionsLocationResponse::TPtr&, const TActorContext&) override {
Y_ABORT();
}

void ApplyResponse(TTabletInfo& tabletInfo, NKikimr::TEvPersQueue::TEvStatusResponse::TPtr& ev, const TActorContext& ctx) override;

void Reply(const TActorContext&) override;

void RaiseError(const TString& error, const Ydb::PersQueue::ErrorCode::ErrorCode errorCode, const Ydb::StatusIds::StatusCode status, const TActorContext&) override;
Expand Down
108 changes: 108 additions & 0 deletions ydb/core/kafka_proxy/ut/ut_protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,11 @@ Y_UNIT_TEST_SUITE(KafkaProtocol) {
TString topicName = "/Root/topic-0-test";
TString shortTopicName = "topic-0-test";
TString notExistsTopicName = "/Root/not-exists";

TString tableName = "/Root/table-0-test";
TString feedName = "feed";
TString feedPath = tableName + "/" + feedName;

ui64 minActivePartitions = 10;

TString key = "record-key";
Expand Down Expand Up @@ -1207,6 +1212,60 @@ Y_UNIT_TEST_SUITE(KafkaProtocol) {
}
}

{
NYdb::NTable::TTableClient tableClient(*testServer.Driver);
tableClient.RetryOperationSync([&](TSession session)
{
NYdb::NTable::TTableBuilder builder;
builder.AddNonNullableColumn("key", NYdb::EPrimitiveType::Int64).SetPrimaryKeyColumn("key");
builder.AddNonNullableColumn("value", NYdb::EPrimitiveType::Int64);

auto createResult = session.CreateTable(tableName, builder.Build()).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL(createResult.IsTransportError(), false);
Cerr << createResult.GetIssues().ToString() << "\n";
UNIT_ASSERT_VALUES_EQUAL(createResult.GetStatus(), EStatus::SUCCESS);

auto alterResult = session.AlterTable(tableName, NYdb::NTable::TAlterTableSettings()
.AppendAddChangefeeds(NYdb::NTable::TChangefeedDescription(feedName,
NYdb::NTable::EChangefeedMode::Updates,
NYdb::NTable::EChangefeedFormat::Json))
).ExtractValueSync();
Cerr << alterResult.GetIssues().ToString() << "\n";
UNIT_ASSERT_VALUES_EQUAL(alterResult.IsTransportError(), false);
UNIT_ASSERT_VALUES_EQUAL(alterResult.GetStatus(), EStatus::SUCCESS);
return alterResult;
}
);

TValueBuilder rows;
rows.BeginList();
rows.AddListItem()
.BeginStruct()
.AddMember("key").Int64(1)
.AddMember("value").Int64(2)
.EndStruct();
rows.EndList();

auto upsertResult = tableClient.BulkUpsert(tableName, rows.Build()).GetValueSync();
UNIT_ASSERT_EQUAL(upsertResult.GetStatus(), EStatus::SUCCESS);
}

{
// Check CDC
std::vector<std::pair<TString, std::vector<i32>>> topics {{feedPath, {0}}};
auto msg = client.Fetch(topics);
UNIT_ASSERT_VALUES_EQUAL(msg->Responses.size(), 1);
UNIT_ASSERT_VALUES_EQUAL(msg->Responses[0].Partitions.size(), 1);
UNIT_ASSERT_VALUES_EQUAL(msg->Responses[0].Partitions[0].ErrorCode, static_cast<TKafkaInt16>(EKafkaErrors::NONE_ERROR));
UNIT_ASSERT_VALUES_EQUAL(msg->Responses[0].Partitions[0].Records.has_value(), true);
UNIT_ASSERT_VALUES_EQUAL(msg->Responses[0].Partitions[0].Records->Records.size(), 1);
auto record = msg->Responses[0].Partitions[0].Records->Records[0];

auto data = record.Value.value();
auto dataStr = TString(data.data(), data.size());
UNIT_ASSERT_VALUES_EQUAL(dataStr, "{\"update\":{\"value\":2},\"key\":[1]}");
}

} // Y_UNIT_TEST(FetchScenario)

Y_UNIT_TEST(BalanceScenario) {
Expand Down Expand Up @@ -2300,4 +2359,53 @@ Y_UNIT_TEST_SUITE(KafkaProtocol) {

Sleep(TDuration::Seconds(1));
}

Y_UNIT_TEST(LoginWithApiKeyWithoutAt) {
TInsecureTestServer testServer;

TString topicName = "/Root/topic-0-test";

NYdb::NTopic::TTopicClient pqClient(*testServer.Driver);
{
auto result =
pqClient
.CreateTopic(topicName,
NYdb::NTopic::TCreateTopicSettings()
.PartitioningSettings(10, 100)
.BeginAddConsumer("consumer-0").EndAddConsumer())
.ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL(result.IsTransportError(), false);
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::SUCCESS);
}

auto settings = NTopic::TReadSessionSettings()
.AppendTopics(NTopic::TTopicReadSettings(topicName))
.ConsumerName("consumer-0");
auto topicReader = pqClient.CreateReadSession(settings);

TTestClient client(testServer.Port);

{
auto msg = client.ApiVersions();

UNIT_ASSERT_VALUES_EQUAL(msg->ErrorCode, static_cast<TKafkaInt16>(EKafkaErrors::NONE_ERROR));
UNIT_ASSERT_VALUES_EQUAL(msg->ApiKeys.size(), 18u);
}

{
auto msg = client.SaslHandshake();

UNIT_ASSERT_VALUES_EQUAL(msg->ErrorCode, static_cast<TKafkaInt16>(EKafkaErrors::NONE_ERROR));
UNIT_ASSERT_VALUES_EQUAL(msg->Mechanisms.size(), 1u);
UNIT_ASSERT_VALUES_EQUAL(*msg->Mechanisms[0], "PLAIN");
}

{
auto msg = client.SaslAuthenticate("/Root", "ApiKey-value-valid");
Cerr << msg->ErrorMessage << "\n";
UNIT_ASSERT_VALUES_EQUAL(msg->ErrorCode, static_cast<TKafkaInt16>(EKafkaErrors::NONE_ERROR));
}

Sleep(TDuration::Seconds(1));
}
} // Y_UNIT_TEST_SUITE(KafkaProtocol)
16 changes: 14 additions & 2 deletions ydb/core/kqp/provider/yql_kikimr_gateway.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,20 @@ static std::shared_ptr<THashMap<TString, Ydb::Topic::Codec>> GetCodecsMapping()

static std::shared_ptr<THashMap<TString, Ydb::Topic::AutoPartitioningStrategy>> GetAutoPartitioningStrategiesMapping() {
static std::shared_ptr<THashMap<TString, Ydb::Topic::AutoPartitioningStrategy>> strategiesMapping;
if (strategiesMapping == nullptr) {
strategiesMapping = MakeEnumMapping<Ydb::Topic::AutoPartitioningStrategy>(Ydb::Topic::AutoPartitioningStrategy_descriptor(), "auto_partitioning_strategy_");
if (!strategiesMapping) {
strategiesMapping = MakeEnumMapping<Ydb::Topic::AutoPartitioningStrategy>(
Ydb::Topic::AutoPartitioningStrategy_descriptor(), "auto_partitioning_strategy_");

const TString prefix = "scale_";
for (const auto& [key, value] : *strategiesMapping) {
if (key.StartsWith(prefix)) {
TString newKey = key;
newKey.erase(0, prefix.length());

Y_ABORT_UNLESS(strategiesMapping->find(newKey) == strategiesMapping->end());
(*strategiesMapping)[newKey] = value;
}
}
}
return strategiesMapping;
}
Expand Down
59 changes: 50 additions & 9 deletions ydb/core/persqueue/fetch_request_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ struct TEvPrivate {
TActorId RequesterId;
ui64 PendingQuotaAmount;

std::unordered_map<TString, TString> PrivateTopicPathToCdcPath;
std::unordered_map<TString, TString> CdcPathToPrivateTopicPath;

public:
static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
return NKikimrServices::TActivity::PQ_FETCH_REQUEST;
Expand Down Expand Up @@ -176,16 +179,24 @@ struct TEvPrivate {
schemeCacheRequest->DatabaseName = Settings.Database;

THashSet<TString> topicsRequested;
for (const auto& part : Settings.Partitions) {
auto ins = topicsRequested.insert(part.Topic).second;
if (!ins)
continue;
auto split = NKikimr::SplitPath(part.Topic);

if (PrivateTopicPathToCdcPath.empty()) {
for (const auto& part : Settings.Partitions) {
topicsRequested.insert(part.Topic);
}
} else {
for (const auto& [key, value] : PrivateTopicPathToCdcPath) {
topicsRequested.insert(key);
}
}

for (const auto& topicName : topicsRequested) {
auto split = NKikimr::SplitPath(topicName);
TSchemeCacheNavigate::TEntry entry;
entry.Path.insert(entry.Path.end(), split.begin(), split.end());

entry.SyncVersion = true;
entry.ShowPrivatePath = false;
entry.ShowPrivatePath = true;
entry.Operation = NSchemeCache::TSchemeCacheNavigate::OpList;

schemeCacheRequest->ResultSet.emplace_back(std::move(entry));
Expand All @@ -197,6 +208,7 @@ struct TEvPrivate {
void HandleSchemeCacheResponse(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev, const TActorContext& ctx) {
LOG_DEBUG_S(ctx, NKikimrServices::PQ_FETCH_REQUEST, "Handle SchemeCache response");
auto& result = ev->Get()->Request;
bool anyCdcTopicInRequest = false;
for (const auto& entry : result->ResultSet) {
auto path = CanonizePath(NKikimr::JoinPath(entry.Path));
switch (entry.Status) {
Expand All @@ -219,6 +231,16 @@ struct TEvPrivate {
), ctx
);
}
if (entry.Kind == NSchemeCache::TSchemeCacheNavigate::KindCdcStream) {
anyCdcTopicInRequest = true;
Y_ABORT_UNLESS(entry.ListNodeEntry->Children.size() == 1);
auto privateTopicPath = CanonizePath(JoinPath(ChildPath(NKikimr::SplitPath(path), entry.ListNodeEntry->Children.at(0).Name)));
PrivateTopicPathToCdcPath[privateTopicPath] = path;
CdcPathToPrivateTopicPath[path] = privateTopicPath;
TopicInfo[privateTopicPath] = TopicInfo[path];
TopicInfo.erase(path);
continue;
}
if (entry.Kind != TSchemeCacheNavigate::EKind::KindTopic) {
return SendReplyAndDie(
CreateErrorReply(
Expand Down Expand Up @@ -256,6 +278,12 @@ struct TEvPrivate {
topicInfo.BalancerTabletId = description.GetBalancerTabletID();
topicInfo.PQInfo = entry.PQGroupInfo;
}

if (anyCdcTopicInRequest) {
SendSchemeCacheRequest(ctx);
return;
}

for (auto& p: TopicInfo) {
ProcessMetadata(p.first, p.second, ctx);
}
Expand Down Expand Up @@ -393,8 +421,15 @@ struct TEvPrivate {
return SendReplyAndDie(std::move(Response), ctx);
}
Y_ABORT_UNLESS(FetchRequestReadsDone < Settings.Partitions.size());
const auto& req = Settings.Partitions[FetchRequestReadsDone];
const auto& topic = req.Topic;
auto& req = Settings.Partitions[FetchRequestReadsDone];

auto& topic = req.Topic;

auto cdcToPrivateIt = CdcPathToPrivateTopicPath.find(req.Topic);
if (cdcToPrivateIt != CdcPathToPrivateTopicPath.end()) {
topic = cdcToPrivateIt->second;
}

const auto& offset = req.Offset;
const auto& part = req.Partition;
const auto& maxBytes = req.MaxBytes;
Expand Down Expand Up @@ -462,7 +497,13 @@ struct TEvPrivate {
const auto& topic = req.Topic;
const auto& part = req.Partition;

res->SetTopic(topic);
auto privateTopicToCdcIt = PrivateTopicPathToCdcPath.find(topic);
if (privateTopicToCdcIt == PrivateTopicPathToCdcPath.end()) {
res->SetTopic(topic);
} else {
res->SetTopic(PrivateTopicPathToCdcPath[topic]);
}

res->SetPartition(part);
auto read = res->MutableReadResult();
if (record.HasPartitionResponse() && record.GetPartitionResponse().HasCmdReadResult())
Expand Down
26 changes: 21 additions & 5 deletions ydb/services/lib/actors/pq_schema_actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ namespace NKikimr::NGRpcProxy::V1 {
if (ProcessCdc(response)) {
return;
}

AddIssue(
FillIssue(
TStringBuilder() << "path '" << path << "' is not compatible scheme object",
Expand Down Expand Up @@ -290,6 +289,7 @@ namespace NKikimr::NGRpcProxy::V1 {
const TMaybe<TString>& GetCdcStreamName() const {
return CdcStreamName;
}

void HandleCacheNavigateResponse(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {
return static_cast<TDerived*>(this)->HandleCacheNavigateResponse(ev);
}
Expand Down Expand Up @@ -537,11 +537,15 @@ namespace NKikimr::NGRpcProxy::V1 {
virtual void HandleCacheNavigateResponse(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) = 0;

TString GetTopicPath() const override {
return TBase::TopicPath;
auto path = TBase::TopicPath;
if (PrivateTopicName) {
path = JoinPath(ChildPath(NKikimr::SplitPath(path), *PrivateTopicName));
}
return path;
}

void SendDescribeProposeRequest() {
return TBase::SendDescribeProposeRequest(this->ActorContext(), false);
void SendDescribeProposeRequest(bool showPrivate = false) {
return TBase::SendDescribeProposeRequest(this->ActorContext(), showPrivate);
}

bool HandleCacheNavigateResponseBase(TEvTxProxySchemeCache::TEvNavigateKeySetResult::TPtr& ev) {
Expand Down Expand Up @@ -590,16 +594,28 @@ namespace NKikimr::NGRpcProxy::V1 {
return false;
}

bool ProcessCdc(const NSchemeCache::TSchemeCacheNavigate::TEntry& response) override {
if constexpr (THasCdcStreamCompatibility<TDerived>::Value) {
if (static_cast<TDerived*>(this)->IsCdcStreamCompatible()) {
Y_ABORT_UNLESS(response.ListNodeEntry->Children.size() == 1);
PrivateTopicName = response.ListNodeEntry->Children.at(0).Name;
SendDescribeProposeRequest(true);
return true;
}
}
return false;
}


private:
TRequest Request;
TActorId Requester;
TMaybe<TString> PrivateTopicName;

protected:
THolder<TEvResponse> Response;
TIntrusiveConstPtr<NSchemeCache::TSchemeCacheNavigate::TPQGroupInfo> PQGroupInfo;
TIntrusiveConstPtr<NSchemeCache::TSchemeCacheNavigate::TDirEntryInfo> Self;
TMaybe<TString> PrivateTopicName;
};

}
Loading
Loading