Skip to content

Commit f22102b

Browse files
authored
Fixed commit offset for pqv0 and pqv1 in federated logbroker (#20083)
2 parents 8f01128 + d233d43 commit f22102b

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ydb/services/deprecated/persqueue_v0/grpc_pq_read_actor.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,6 @@ void TReadSessionActor::SendAuthRequest(const TActorContext& ctx) {
752752
CreateInitAndAuthActor(ctx);
753753
return;
754754
}
755-
auto database = Database.empty() ? NKikimr::NPQ::GetDatabaseFromConfig(AppData(ctx)->PQConfig) : Database;
756755
Y_ABORT_UNLESS(TopicsList.IsValid);
757756
TVector<TDiscoveryConverterPtr> topics;
758757
for(const auto& t : TopicsList.Topics) {
@@ -801,7 +800,6 @@ void TReadSessionActor::HandleDescribeTopicsResponse(TEvDescribeTopicsResponse::
801800
}
802801

803802
void TReadSessionActor::CreateInitAndAuthActor(const TActorContext& ctx) {
804-
auto database = Database.empty() ? NKikimr::NPQ::GetDatabaseFromConfig(AppData(ctx)->PQConfig) : Database;
805803
AuthInitActor = ctx.Register(new V1::TReadInitAndAuthActor(
806804
ctx, ctx.SelfID, InternalClientId, Cookie, Session, PqMetaCache, NewSchemeCache, Counters, Token,
807805
TopicsList, TopicsHandler.GetLocalCluster()
@@ -1090,9 +1088,10 @@ void TReadSessionActor::Handle(TEvPersQueue::TEvLockPartition::TPtr& ev, const T
10901088
auto it = TopicCounters.find(intName);
10911089
Y_ABORT_UNLESS(it != TopicCounters.end());
10921090

1091+
auto database = jt->second.DbPath;
10931092
IActor* partitionActor = new TPartitionActor(
10941093
ctx.SelfID, InternalClientId, Cookie, Session, record.GetGeneration(),
1095-
record.GetStep(), jt->second.FullConverter, Database.empty() ? NKikimr::NPQ::GetDatabaseFromConfig(AppData(ctx)->PQConfig) : Database, record.GetPartition(), record.GetTabletId(), it->second,
1094+
record.GetStep(), jt->second.FullConverter, database, record.GetPartition(), record.GetTabletId(), it->second,
10961095
ClientDC, jt->second.PartitionGraph->GetPartition(record.GetPartition())->AllParents
10971096
);
10981097

ydb/services/persqueue_v1/actors/read_session_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ void TReadSessionActor<UseMigrationProtocol>::Handle(TEvPersQueue::TEvLockPartit
12781278
}
12791279

12801280
const auto& parentPartitions = partitionNode->AllParents;
1281-
const auto database = Request->GetDatabaseName().GetOrElse(AppData(ctx)->PQConfig.GetDatabase());
1281+
const auto database = topic.DbPath;
12821282
const TActorId actorId = ctx.Register(new TPartitionActor(
12831283
ctx.SelfID, ClientId, ClientPath, Cookie, Session, partitionId, record.GetGeneration(),
12841284
record.GetStep(), record.GetTabletId(), it->second, CommitsDisabled, ClientDC, RangesMode,

0 commit comments

Comments
 (0)