Skip to content

Commit 4ba3a09

Browse files
Default values for feature flags EnablePQConfigTransactionsAtSchemeshard and EnableTopicServiceTx (ydb-platform#8845)
1 parent 9f9d1de commit 4ba3a09

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

ydb/core/persqueue/pq_impl.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4661,6 +4661,8 @@ void TPersQueue::TryStartTransaction(const TActorContext& ctx)
46614661
Y_ABORT_UNLESS(next);
46624662

46634663
CheckTxState(ctx, *next);
4664+
4665+
TryWriteTxs(ctx);
46644666
}
46654667

46664668
void TPersQueue::OnInitComplete(const TActorContext& ctx)

ydb/core/tx/datashard/datashard_ut_change_exchange.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,8 @@ Y_UNIT_TEST_SUITE(Cdc) {
12481248

12491249
// get records
12501250
{
1251+
WaitForDataRecords(client, shardIt);
1252+
12511253
auto res = client.GetRecords(shardIt).ExtractValueSync();
12521254
UNIT_ASSERT_C(res.IsSuccess(), res.GetIssues().ToString());
12531255
UNIT_ASSERT_VALUES_EQUAL(res.GetResult().records().size(), records.size());
@@ -1269,6 +1271,19 @@ Y_UNIT_TEST_SUITE(Cdc) {
12691271
}
12701272
}
12711273

1274+
static void WaitForDataRecords(TDataStreamsClient& client, const TString& shardIt) {
1275+
int n = 0;
1276+
for (; n < 100; ++n) {
1277+
auto res = client.GetRecords(shardIt).ExtractValueSync();
1278+
UNIT_ASSERT_C(res.IsSuccess(), res.GetIssues().ToString());
1279+
if (res.GetResult().records().size()) {
1280+
break;
1281+
}
1282+
Sleep(TDuration::MilliSeconds(100));
1283+
}
1284+
UNIT_ASSERT_VALUES_UNEQUAL(n, 100);
1285+
}
1286+
12721287
static void Write(const TShardedTableOptions& tableDesc, const TCdcStream& streamDesc) {
12731288
TTestYdsEnv env(tableDesc, streamDesc);
12741289

ydb/core/tx/schemeshard/ut_base/ut_base.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6331,6 +6331,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) {
63316331
"PartitionPerTablet: 10 "
63326332
"PQTabletConfig: {PartitionConfig { LifetimeSeconds : 10}}"
63336333
);
6334+
env.TestWaitNotification(runtime, txId);
63346335

63356336
TestDescribeResult(DescribePath(runtime, "/MyRoot/DirA/PQGroup_1", true),
63366337
{NLs::CheckPartCount("PQGroup_1", 100, 10, 10, 100),
@@ -6853,7 +6854,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) {
68536854
AsyncForceDropUnsafe(runtime, ++txId, pVer.PathId.LocalPathId);
68546855

68556856
TestModificationResult(runtime, txId-2, NKikimrScheme::StatusAccepted);
6856-
TestModificationResult(runtime, txId-1, NKikimrScheme::StatusAccepted);
6857+
TestModificationResults(runtime, txId-1, {NKikimrScheme::StatusAccepted, NKikimrScheme::StatusMultipleModifications});
68576858
TestModificationResult(runtime, txId, NKikimrScheme::StatusAccepted);
68586859

68596860
TActorId sender = runtime.AllocateEdgeActor();

0 commit comments

Comments
 (0)