@@ -554,7 +554,7 @@ class TMonitoringProxy : public TActorBootstrapped<TMonitoringProxy> {
554
554
, TabletID(tabletId)
555
555
, Inflight(inflight)
556
556
{
557
- for (auto & p: Partitions) {
557
+ for (auto & p : Partitions) {
558
558
Results[p.first ].push_back (Sprintf (" Partition %u: NO DATA" , p.first ));
559
559
}
560
560
}
@@ -691,6 +691,10 @@ void TPersQueue::ApplyNewConfigAndReply(const TActorContext& ctx)
691
691
ClearNewConfig ();
692
692
693
693
for (auto & p : Partitions) { // change config for already created partitions
694
+ if (p.first .IsSupportivePartition ()) {
695
+ continue ;
696
+ }
697
+
694
698
ctx.Send (p.second .Actor , new TEvPQ::TEvChangePartitionConfig (TopicConverter, Config, BootstrapConfigTx ? *BootstrapConfigTx : NKikimrPQ::TBootstrapConfig ()));
695
699
}
696
700
ChangePartitionConfigInflight += Partitions.size ();
@@ -1865,13 +1869,19 @@ void TPersQueue::Handle(TEvPersQueue::TEvOffsets::TPtr& ev, const TActorContext&
1865
1869
}
1866
1870
ui32 cnt = 0 ;
1867
1871
for (auto & p : Partitions) {
1868
- cnt += p.second .InitDone ;
1872
+ if (p.first .IsSupportivePartition ()) {
1873
+ continue ;
1874
+ }
1875
+
1876
+ cnt += p.second .InitDone ;
1869
1877
}
1870
1878
TActorId ans = CreateOffsetsProxyActor (TabletID (), ev->Sender , cnt, ctx);
1871
1879
1872
1880
for (auto & p : Partitions) {
1873
- if (!p.second .InitDone )
1881
+ if (!p.second .InitDone || p. first . IsSupportivePartition ()) {
1874
1882
continue ;
1883
+ }
1884
+
1875
1885
THolder<TEvPQ::TEvPartitionOffsets> event = MakeHolder<TEvPQ::TEvPartitionOffsets>(ans, ev->Get ()->Record .HasClientId () ?
1876
1886
ev->Get ()->Record .GetClientId () : " " );
1877
1887
ctx.Send (p.second .Actor , event.Release ());
@@ -1929,15 +1939,20 @@ void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext&
1929
1939
}
1930
1940
1931
1941
ui32 cnt = 0 ;
1932
- for (auto & [_, partitionInfo] : Partitions) {
1933
- cnt += partitionInfo.InitDone ;
1942
+ for (auto & [partitionId, partitionInfo] : Partitions) {
1943
+ if (partitionId.IsSupportivePartition ()) {
1944
+ continue ;
1945
+ }
1946
+
1947
+ cnt += partitionInfo.InitDone ;
1934
1948
}
1935
1949
1936
1950
TActorId ans = CreateStatusProxyActor (TabletID (), ev->Sender , cnt, ev->Cookie , ctx);
1937
1951
for (auto & p : Partitions) {
1938
- if (!p.second .InitDone ) {
1952
+ if (!p.second .InitDone || p. first . IsSupportivePartition () ) {
1939
1953
continue ;
1940
1954
}
1955
+
1941
1956
THolder<TEvPQ::TEvPartitionStatus> event;
1942
1957
if (ev->Get ()->Record .GetConsumers ().empty ()) {
1943
1958
event = MakeHolder<TEvPQ::TEvPartitionStatus>(ans, ev->Get ()->Record .HasClientId () ? ev->Get ()->Record .GetClientId () : " " ,
@@ -4544,7 +4559,11 @@ void TPersQueue::SendProposeTransactionAbort(const TActorId& target,
4544
4559
void TPersQueue::SendEvProposePartitionConfig (const TActorContext& ctx,
4545
4560
TDistributedTransaction& tx)
4546
4561
{
4547
- for (auto & [_, partition] : Partitions) {
4562
+ for (auto & [partitionId, partition] : Partitions) {
4563
+ if (partitionId.IsSupportivePartition ()) {
4564
+ continue ;
4565
+ }
4566
+
4548
4567
auto event = std::make_unique<TEvPQ::TEvProposePartitionConfig>(tx.Step , tx.TxId );
4549
4568
4550
4569
event->TopicConverter = tx.TopicConverter ;
@@ -4555,7 +4574,7 @@ void TPersQueue::SendEvProposePartitionConfig(const TActorContext& ctx,
4555
4574
}
4556
4575
4557
4576
tx.PartitionRepliesCount = 0 ;
4558
- tx.PartitionRepliesExpected = Partitions. size () ;
4577
+ tx.PartitionRepliesExpected = OriginalPartitionsCount ;
4559
4578
}
4560
4579
4561
4580
TActorId TPersQueue::GetPartitionQuoter (const TPartitionId& partition) {
0 commit comments