Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add and fix scheme operations tests #5239

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Add and fix scheme operations tests #5239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/config/muted_ya.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ydb/core/kqp/ut/service KqpQueryService.ExecuteQueryPgTableSelect
ydb/core/kqp/ut/service KqpQueryService.QueryOnClosedSession
ydb/core/kqp/ut/service KqpService.CloseSessionsWithLoad
ydb/core/kqp/ut/service [38/50]*
ydb/core/persqueue/ut TPartitionTests.TestBatchingWithProposeConfig
ydb/core/persqueue/ut TPQTest.*DirectRead*
ydb/core/persqueue/ut TopicAutoscaling.PartitionSplit_ManySession_NewSDK
ydb/core/tx/coordinator/ut Coordinator.RestoreTenantConfiguration
Expand Down
57 changes: 34 additions & 23 deletions ydb/core/persqueue/ut/partition_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2704,10 +2704,6 @@ class TBatchingConditionsTest {
TPartitionTxTestHelper* TxHelper;
ui64 SeqNo = 1;
ui64 TxTmp;
TVector<TString> SourceIds = {"src1", "src2", "src3", "src4"};
TVector<TString> Clients = {"client1", "client2", "client3", "client4"};
TVector<TString> Sessions = {"session1", "session2", "session3", "session4"};
TVector<TString> Owners;

public:
TString SrcId = "src1";
Expand Down Expand Up @@ -3068,49 +3064,64 @@ Y_UNIT_TEST_F(ConflictingCommitProccesAfterRollback, TPartitionTxTestHelper) {
}

Y_UNIT_TEST_F(TestBatchingWithChangeConfig, TPartitionTxTestHelper) {
Init();
auto txTmp = MakeAndSendWriteTx({});
SendChangePartitionConfig({.Version=2,
.Consumers={
{.Consumer="client-1", .Generation=0},
{.Consumer="client-3", .Generation=7}
}});
auto immTx = MakeAndSendImmediateTx({});
Init({.ConsumersCount = 2});
auto txTmp = MakeAndSendWriteTx({});
auto immTx1 = MakeAndSendImmediateTxOffsetCommit(1, 0, 5);
SendChangePartitionConfig({.Version=2,
.Consumers={
{.Consumer="client-0", .Offset=5, .Generation=0},
{.Consumer="client-1", .Generation=7}
}});
auto immTx2 = MakeAndSendImmediateTxOffsetCommit(1, 5, 10);
WaitWriteInfoRequest(txTmp, true);
SendTxRollback(txTmp);
WaitWriteInfoRequest(immTx, true);
WaitBatchCompletion(1);
WaitBatchCompletion(2);
ExpectNoBatchCompletion();
EmulateKVTablet();
WaitImmediateTxComplete(immTx1, true);
WaitBatchCompletion(1);
EmulateKVTablet();
WaitImmediateTxComplete(immTx, true);
auto event = Ctx->Runtime->GrabEdgeEvent<TEvPQ::TEvPartitionConfigChanged>();
WaitBatchCompletion(1); // immTx2
EmulateKVTablet();
WaitImmediateTxComplete(immTx2, true);
}

Y_UNIT_TEST_F(TestBatchingWithProposeConfig, TPartitionTxTestHelper) {
Init();
Init({.ConsumersCount = 2});
auto txTmp = MakeAndSendWriteTx({});
auto immTx1 = MakeAndSendImmediateTxOffsetCommit(1, 0, 5);

auto event = std::make_unique<TEvPQ::TEvProposePartitionConfig>(1, GetTxId());
auto proposeTxId = GetTxId();
auto event = std::make_unique<TEvPQ::TEvProposePartitionConfig>(1, proposeTxId);

event->TopicConverter = TopicConverter;
auto copy = Config;
copy.SetVersion(10);
auto* newConsumer = copy.AddConsumers();

newConsumer->SetName("client-0");
newConsumer->SetGeneration(0);

event->Config = std::move(copy);
auto* newConsumer = event->Config.AddConsumers();
newConsumer->SetName("new-consumer");
SendEvent(event.release());
auto immTx2 = MakeAndSendImmediateTxOffsetCommit(1, 5, 10);

auto immTx = MakeAndSendImmediateTx({});
WaitWriteInfoRequest(txTmp, true);
SendTxRollback(txTmp);
WaitWriteInfoRequest(immTx, true);
WaitBatchCompletion(1);
WaitBatchCompletion(2);
ExpectNoBatchCompletion();
EmulateKVTablet();
WaitImmediateTxComplete(immTx1, true);

SendCommitTx(1, proposeTxId);
//ToDo - wait propose result;
WaitBatchCompletion(1);
EmulateKVTablet();
WaitImmediateTxComplete(immTx, true);
WaitCommitTxDone({.TxId=proposeTxId});
WaitBatchCompletion(1);
EmulateKVTablet();
WaitImmediateTxComplete(immTx2, true);
}

Y_UNIT_TEST_F(GetUsedStorage, TPartitionFixture) {
Expand Down
Loading