Skip to content

Commit e3557fc

Browse files
Merge 935baf3 into 4ebd552
2 parents 4ebd552 + 935baf3 commit e3557fc

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

ydb/core/persqueue/pq_impl.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,9 +1511,10 @@ void TPersQueue::Handle(TEvPQ::TEvInitComplete::TPtr& ev, const TActorContext& c
15111511
ctx);
15121512
}
15131513
partition.PendingRequests.clear();
1514+
} else {
1515+
++PartitionsInited;
15141516
}
15151517

1516-
++PartitionsInited;
15171518
Y_ABORT_UNLESS(ConfigInited);//partitions are inited only after config
15181519

15191520
auto allInitialized = AllOriginalPartitionsInited();
@@ -1914,11 +1915,17 @@ void TPersQueue::ProcessStatusRequests(const TActorContext &ctx) {
19141915

19151916
void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext& ctx)
19161917
{
1918+
PQ_LOG_D("Handle TEvPersQueue::TEvStatus");
1919+
19171920
ReadBalancerActorId = ev->Sender;
19181921

19191922
if (!ConfigInited || !AllOriginalPartitionsInited()) {
1920-
StatusRequests.push_back(ev);
1921-
return;
1923+
PQ_LOG_D("Postpone the request." <<
1924+
" ConfigInited " << static_cast<int>(ConfigInited) <<
1925+
", PartitionsInited " << PartitionsInited <<
1926+
", OriginalPartitionsCount " << OriginalPartitionsCount);
1927+
StatusRequests.push_back(ev);
1928+
return;
19221929
}
19231930

19241931
ui32 cnt = 0;

ydb/public/sdk/cpp/client/ydb_topic/ut/topic_to_table_ut.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ class TFixture : public NUnitTest::TBaseFixture {
6060
const TString& consumer = TEST_CONSUMER,
6161
size_t partitionCount = 1,
6262
std::optional<size_t> maxPartitionCount = std::nullopt);
63+
void DescribeTopic(const TString& path);
6364

6465
void WriteToTopicWithInvalidTxId(bool invalidTxId);
6566

@@ -322,6 +323,11 @@ void TFixture::CreateTopic(const TString& path,
322323
Setup->CreateTopic(path, consumer, partitionCount, maxPartitionCount);
323324
}
324325

326+
void TFixture::DescribeTopic(const TString& path)
327+
{
328+
Setup->DescribeTopic(path);
329+
}
330+
325331
const TDriver& TFixture::GetDriver() const
326332
{
327333
return *Driver;
@@ -1106,6 +1112,8 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_6, TFixture)
11061112
UNIT_ASSERT_VALUES_EQUAL(messages[0], "message #1");
11071113
UNIT_ASSERT_VALUES_EQUAL(messages[1], "message #2");
11081114
}
1115+
1116+
DescribeTopic("topic_A");
11091117
}
11101118

11111119
Y_UNIT_TEST_F(WriteToTopic_Demo_7, TFixture)

ydb/public/sdk/cpp/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ void TTopicSdkTestSetup::CreateTopic(const TString& path, const TString& consume
5252
Server.WaitInit(path);
5353
}
5454

55+
void TTopicSdkTestSetup::DescribeTopic(const TString& path)
56+
{
57+
TTopicClient client(MakeDriver());
58+
59+
TDescribeTopicSettings settings;
60+
settings.IncludeStats(true);
61+
settings.IncludeLocation(true);
62+
63+
auto status = client.DescribeTopic(path, settings).GetValueSync();
64+
UNIT_ASSERT(status.IsSuccess());
65+
}
66+
5567
TString TTopicSdkTestSetup::GetEndpoint() const {
5668
return "localhost:" + ToString(Server.GrpcPort);
5769
}

ydb/public/sdk/cpp/client/ydb_topic/ut/ut_utils/topic_sdk_test_setup.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class TTopicSdkTestSetup {
2121
void CreateTopicWithAutoscale(const TString& path = TEST_TOPIC, const TString& consumer = TEST_CONSUMER, size_t partitionCount = 1,
2222
size_t maxPartitionCount = 100);
2323

24+
void DescribeTopic(const TString& path = TEST_TOPIC);
25+
2426
TString GetEndpoint() const;
2527
TString GetTopicPath(const TString& name = TEST_TOPIC) const;
2628
TString GetTopicParent() const;

0 commit comments

Comments
 (0)