Skip to content

Revert "Initializing the configuration of the partition (#15557) (#15577)" #15828

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
Alek5andr-Kotov merged 1 commit into from
Mar 17, 2025
Merged

Revert "Initializing the configuration of the partition (#15557) (#15577)" #15828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion ydb/core/persqueue/partition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2757,7 +2757,7 @@ void TPartition::EndChangePartitionConfig(NKikimrPQ::TPQTabletConfig&& config,

TString TPartition::GetKeyConfig() const
{
return Sprintf("_config_%u", Partition.InternalPartitionId);
return Sprintf("_config_%u", Partition.OriginalPartitionId);
}

void TPartition::ChangePlanStepAndTxId(ui64 step, ui64 txId)
Expand Down
5 changes: 0 additions & 5 deletions ydb/core/persqueue/partition_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@ void TInitConfigStep::Handle(TEvKeyValue::TEvResponse::TPtr& ev, const TActorCon
Y_ABORT("bad status");
};

// There should be no consumers in the configuration of the background partition. When creating a partition,
// the PQ tablet specifically removes all consumer settings from the config.
Y_ABORT_UNLESS(!Partition()->IsSupportive() ||
(Partition()->Config.GetConsumers().empty() && Partition()->TabletConfig.GetConsumers().empty()));

Partition()->PartitionConfig = GetPartitionConfig(Partition()->Config, Partition()->Partition.OriginalPartitionId);
Partition()->PartitionGraph = MakePartitionGraph(Partition()->Config);

Expand Down
1 change: 0 additions & 1 deletion ydb/core/persqueue/pq_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,6 @@ NKikimrPQ::TPQTabletConfig TPersQueue::MakeSupportivePartitionConfig() const
partitionConfig.MutableReadRuleServiceTypes()->Clear();
partitionConfig.MutableReadRuleVersions()->Clear();
partitionConfig.MutableReadRuleGenerations()->Clear();
partitionConfig.MutableConsumers()->Clear();

return partitionConfig;
}
Expand Down
Loading