Skip to content

Commit f753c0e

Browse files
Merge 2926706 into 32f54d3
2 parents 32f54d3 + 2926706 commit f753c0e

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
@@ -1506,9 +1506,10 @@ void TPersQueue::Handle(TEvPQ::TEvInitComplete::TPtr& ev, const TActorContext& c
15061506
ctx);
15071507
}
15081508
partition.PendingRequests.clear();
1509+
} else {
1510+
++PartitionsInited;
15091511
}
15101512

1511-
++PartitionsInited;
15121513
Y_ABORT_UNLESS(ConfigInited);//partitions are inited only after config
15131514

15141515
auto allInitialized = AllOriginalPartitionsInited();
@@ -1907,11 +1908,17 @@ void TPersQueue::ProcessStatusRequests(const TActorContext &ctx) {
19071908

19081909
void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext& ctx)
19091910
{
1911+
PQ_LOG_D("Handle TEvPersQueue::TEvStatus");
1912+
19101913
ReadBalancerActorId = ev->Sender;
19111914

19121915
if (!ConfigInited || !AllOriginalPartitionsInited()) {
1913-
StatusRequests.push_back(ev);
1914-
return;
1916+
PQ_LOG_D("Postpone the request." <<
1917+
" ConfigInited " << static_cast<int>(ConfigInited) <<
1918+
", PartitionsInited " << PartitionsInited <<
1919+
", OriginalPartitionsCount " << OriginalPartitionsCount);
1920+
StatusRequests.push_back(ev);
1921+
return;
19151922
}
19161923

19171924
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
@@ -65,6 +65,7 @@ class TFixture : public NUnitTest::TBaseFixture {
6565
const TString& consumer = TEST_CONSUMER,
6666
size_t partitionCount = 1,
6767
std::optional<size_t> maxPartitionCount = std::nullopt);
68+
void DescribeTopic(const TString& path);
6869

6970
void WriteToTopicWithInvalidTxId(bool invalidTxId);
7071

@@ -328,6 +329,11 @@ void TFixture::CreateTopic(const TString& path,
328329
Setup->CreateTopic(path, consumer, partitionCount, maxPartitionCount);
329330
}
330331

332+
void TFixture::DescribeTopic(const TString& path)
333+
{
334+
Setup->DescribeTopic(path);
335+
}
336+
331337
const TDriver& TFixture::GetDriver() const
332338
{
333339
return *Driver;
@@ -1122,6 +1128,8 @@ Y_UNIT_TEST_F(WriteToTopic_Demo_6, TFixture)
11221128
UNIT_ASSERT_VALUES_EQUAL(messages[0], "message #1");
11231129
UNIT_ASSERT_VALUES_EQUAL(messages[1], "message #2");
11241130
}
1131+
1132+
DescribeTopic("topic_A");
11251133
}
11261134

11271135
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)