Skip to content

Commit 20d8173

Browse files
Merge 3cb15b3 into 84e30aa
2 parents 84e30aa + 3cb15b3 commit 20d8173

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

ydb/core/persqueue/pq_impl.cpp

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

46694669
CheckTxState(ctx, *next);
4670+
4671+
TryWriteTxs(ctx);
46704672
}
46714673

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

ydb/core/protos/feature_flags.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,16 @@ message TFeatureFlags {
9898
reserved 83; // EnableKqpDataQuerySourceRead
9999
optional bool EnableSmallDiskOptimization = 84 [default = true];
100100
optional bool EnableDataShardVolatileTransactions = 85 [default = false];
101-
optional bool EnableTopicServiceTx = 86 [default = false];
101+
optional bool EnableTopicServiceTx = 86 [default = true];
102102
optional bool EnableLLVMCache = 87 [default = false];
103103
optional bool EnableExternalDataSources = 88 [default = false];
104104
optional bool EnableTopicDiskSubDomainQuota = 89 [default = true];
105105
optional bool EnableSeparationComputeActorsFromRead = 90 [default = false];
106-
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = false];
106+
optional bool EnablePQConfigTransactionsAtSchemeShard = 91 [default = true];
107107
optional bool EnableScriptExecutionOperations = 92 [default = true];
108108
optional bool EnableImplicitQueryParameterTypes = 93 [default = false];
109109
optional bool EnableForceImmediateEffectsExecution = 94 [default = false];
110-
optional bool EnableTopicSplitMerge = 95 [default = false];
110+
optional bool EnableTopicSplitMerge = 95 [default = true];
111111
optional bool EnableChangefeedDynamoDBStreamsFormat = 96 [default = true];
112112
optional bool ForceColumnTablesCompositeMarks = 97 [default = false];
113113
optional bool EnableSubscriptionsInDiscovery = 98 [default = false];

ydb/core/tx/datashard/datashard_ut_change_exchange.cpp

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

12481248
// get records
12491249
{
1250+
WaitForDataRecords(client, shardIt);
1251+
12501252
auto res = client.GetRecords(shardIt).ExtractValueSync();
12511253
UNIT_ASSERT_C(res.IsSuccess(), res.GetIssues().ToString());
12521254
UNIT_ASSERT_VALUES_EQUAL(res.GetResult().records().size(), records.size());
@@ -1268,6 +1270,19 @@ Y_UNIT_TEST_SUITE(Cdc) {
12681270
}
12691271
}
12701272

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6343,6 +6343,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) {
63436343
"PartitionPerTablet: 10 "
63446344
"PQTabletConfig: {PartitionConfig { LifetimeSeconds : 10}}"
63456345
);
6346+
env.TestWaitNotification(runtime, txId);
63466347

63476348
TestDescribeResult(DescribePath(runtime, "/MyRoot/DirA/PQGroup_1", true),
63486349
{NLs::CheckPartCount("PQGroup_1", 100, 10, 10, 100),

0 commit comments

Comments
 (0)