From e3b2bd978b0eb6fb4edd87bb9fc9689174673679 Mon Sep 17 00:00:00 2001 From: Alexander Kotov Date: Wed, 15 May 2024 12:32:09 +0300 Subject: [PATCH 1/5] [*] refactoring --- ydb/services/persqueue_v1/persqueue_ut.cpp | 8 ++++---- .../persqueue_v1/ut/persqueue_common_tests.h | 2 +- .../persqueue_v1/ut/persqueue_test_fixture.h | 12 +++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp index cefeba6bacdd..05dc38ec0cb8 100644 --- a/ydb/services/persqueue_v1/persqueue_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_ut.cpp @@ -953,7 +953,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadPreCached) { - TPersQueueV1TestServer server{true}; + TPersQueueV1TestServer server{{.CheckAcl=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; setup.DoWrite(pqClient->GetDriver(), "acc/topic1", 1_MB, 30); @@ -981,7 +981,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadNotCached) { - TPersQueueV1TestServer server{true}; + TPersQueueV1TestServer server{{.CheckAcl=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; @@ -1013,7 +1013,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadBadCases) { - TPersQueueV1TestServer server{true}; + TPersQueueV1TestServer server{{.CheckAcl=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; setup.InitControlSession("acc/topic1"); @@ -1042,7 +1042,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadStop) { - TPersQueueV1TestServer server{true}; + TPersQueueV1TestServer server{{.CheckAcl=true}}; SET_LOCALS; server.Server->AnnoyingClient->AlterTopicNoLegacy("Root/PQ/rt3.dc1--acc--topic1", 2); diff --git a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h index 515667c51247..11133b31e691 100644 --- a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h +++ b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h @@ -51,7 +51,7 @@ class TCommonTests { {} TPersQueueV1TestServer CreateServer() { - return TPersQueueV1TestServer(false, TenantModeEnabled); + return TPersQueueV1TestServer({.CheckAcl=false, .TenantModeEnabled=TenantModeEnabled}); } TPersQueueV1TestServerWithRateLimiter CreateServerWithRateLimiter() { diff --git a/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h b/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h index f225ddf9aaed..5cc5ce228e18 100644 --- a/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h +++ b/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h @@ -214,11 +214,17 @@ static void ModifyTopicACL(NYdb::TDriver* driver, const TString& topic, const TV THolder PersQueueClient; }; + struct TPersQueueV1TestServerSettings { + bool CheckAcl = false; + bool TenantModeEnabled = false; + ui32 NodeCount = PQ_DEFAULT_NODE_COUNT; + }; + class TPersQueueV1TestServer : public TPersQueueV1TestServerBase { public: - TPersQueueV1TestServer(bool checkAcl = false, bool tenantModeEnabled = false) - : TPersQueueV1TestServerBase(tenantModeEnabled) - , CheckACL(checkAcl) + explicit TPersQueueV1TestServer(const TPersQueueV1TestServerSettings& settings = {}) + : TPersQueueV1TestServerBase(settings.TenantModeEnabled) + , CheckACL(settings.CheckAcl) { InitAll(); } From 7c0617ab6e56b0388284e98340a305f49e227181 Mon Sep 17 00:00:00 2001 From: Alexander Kotov Date: Wed, 15 May 2024 13:12:05 +0300 Subject: [PATCH 2/5] [*] refactoring --- ydb/services/persqueue_v1/persqueue_ut.cpp | 8 ++++---- .../persqueue_v1/ut/persqueue_common_tests.h | 2 +- .../persqueue_v1/ut/persqueue_test_fixture.h | 20 ++++++++++++++----- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp index 05dc38ec0cb8..e403caaed36d 100644 --- a/ydb/services/persqueue_v1/persqueue_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_ut.cpp @@ -953,7 +953,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadPreCached) { - TPersQueueV1TestServer server{{.CheckAcl=true}}; + TPersQueueV1TestServer server{{.CheckACL=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; setup.DoWrite(pqClient->GetDriver(), "acc/topic1", 1_MB, 30); @@ -981,7 +981,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadNotCached) { - TPersQueueV1TestServer server{{.CheckAcl=true}}; + TPersQueueV1TestServer server{{.CheckACL=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; @@ -1013,7 +1013,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadBadCases) { - TPersQueueV1TestServer server{{.CheckAcl=true}}; + TPersQueueV1TestServer server{{.CheckACL=true}}; SET_LOCALS; TDirectReadTestSetup setup{server}; setup.InitControlSession("acc/topic1"); @@ -1042,7 +1042,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadStop) { - TPersQueueV1TestServer server{{.CheckAcl=true}}; + TPersQueueV1TestServer server{{.CheckACL=true}}; SET_LOCALS; server.Server->AnnoyingClient->AlterTopicNoLegacy("Root/PQ/rt3.dc1--acc--topic1", 2); diff --git a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h index 11133b31e691..fda8300d402b 100644 --- a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h +++ b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h @@ -51,7 +51,7 @@ class TCommonTests { {} TPersQueueV1TestServer CreateServer() { - return TPersQueueV1TestServer({.CheckAcl=false, .TenantModeEnabled=TenantModeEnabled}); + return TPersQueueV1TestServer({.CheckACL=false, .TenantModeEnabled=TenantModeEnabled}); } TPersQueueV1TestServerWithRateLimiter CreateServerWithRateLimiter() { diff --git a/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h b/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h index 5cc5ce228e18..72c0036444a5 100644 --- a/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h +++ b/ydb/services/persqueue_v1/ut/persqueue_test_fixture.h @@ -60,10 +60,13 @@ static void ModifyTopicACL(NYdb::TDriver* driver, const TString& topic, const TV Y_UNUSED(settings); } + virtual NKikimr::Tests::TServerSettings GetServerSettings() { + return NKikimr::NPersQueueTests::PQSettings(); + } void InitializePQ() { Y_ABORT_UNLESS(Server == nullptr); - Server = MakeHolder(false); + Server = MakeHolder(GetServerSettings(), false); Server->ServerSettings.PQConfig.SetTopicsAreFirstClassCitizen(TenantModeEnabled()); Server->ServerSettings.PQConfig.MutablePQDiscoveryConfig()->SetLBFrontEnabled(true); Server->ServerSettings.PQConfig.SetACLRetryTimeoutSec(1); @@ -215,7 +218,7 @@ static void ModifyTopicACL(NYdb::TDriver* driver, const TString& topic, const TV }; struct TPersQueueV1TestServerSettings { - bool CheckAcl = false; + bool CheckACL = false; bool TenantModeEnabled = false; ui32 NodeCount = PQ_DEFAULT_NODE_COUNT; }; @@ -224,7 +227,7 @@ static void ModifyTopicACL(NYdb::TDriver* driver, const TString& topic, const TV public: explicit TPersQueueV1TestServer(const TPersQueueV1TestServerSettings& settings = {}) : TPersQueueV1TestServerBase(settings.TenantModeEnabled) - , CheckACL(settings.CheckAcl) + , Settings(settings) { InitAll(); } @@ -234,11 +237,18 @@ static void ModifyTopicACL(NYdb::TDriver* driver, const TString& topic, const TV } void AlterSettings(NKikimr::Tests::TServerSettings& settings) override { - if (CheckACL) + if (Settings.CheckACL) { settings.PQConfig.SetCheckACL(true); + } } + + NKikimr::Tests::TServerSettings GetServerSettings() override { + return NKikimr::NPersQueueTests::PQSettings() + .SetNodeCount(Settings.NodeCount); + } + private: - bool CheckACL; + TPersQueueV1TestServerSettings Settings; }; class TPersQueueV1TestServerWithRateLimiter : public TPersQueueV1TestServerBase { From 449570c15f26be0a6ea9b62210a775f450397d03 Mon Sep 17 00:00:00 2001 From: Alexander Kotov Date: Wed, 15 May 2024 13:35:55 +0300 Subject: [PATCH 3/5] [-] test TPersQueueTest::DirectReadStop --- .github/config/muted_ya.txt | 1 - ydb/services/persqueue_v1/persqueue_ut.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt index e45e776d3944..c8d301774479 100644 --- a/.github/config/muted_ya.txt +++ b/.github/config/muted_ya.txt @@ -62,7 +62,6 @@ ydb/services/persqueue_v1/ut TPersQueueTest.SetupLockSession ydb/services/persqueue_v1/ut TPQCompatTest.BadTopics ydb/services/persqueue_v1/ut TPersQueueTest.DirectRead*Cache* ydb/services/persqueue_v1/ut [3/10]* -ydb/services/persqueue_v1/ut TPersQueueTest.DirectReadStop ydb/services/ydb/sdk_sessions_pool_ut YdbSdkSessionsPool.StressTestSync* ydb/services/ydb/sdk_sessions_ut YdbSdkSessions.TestActiveSessionCountAfterBadSession ydb/services/ydb/sdk_sessions_ut [6/10]* diff --git a/ydb/services/persqueue_v1/persqueue_ut.cpp b/ydb/services/persqueue_v1/persqueue_ut.cpp index e403caaed36d..8842eade132f 100644 --- a/ydb/services/persqueue_v1/persqueue_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_ut.cpp @@ -1042,7 +1042,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) { } Y_UNIT_TEST(DirectReadStop) { - TPersQueueV1TestServer server{{.CheckACL=true}}; + TPersQueueV1TestServer server{{.CheckACL=true, .NodeCount=1}}; SET_LOCALS; server.Server->AnnoyingClient->AlterTopicNoLegacy("Root/PQ/rt3.dc1--acc--topic1", 2); From 528be9e024188f58cf3ade65bb91d3437fc5b87c Mon Sep 17 00:00:00 2001 From: Alexander Kotov Date: Wed, 15 May 2024 14:15:05 +0300 Subject: [PATCH 4/5] [-] tests in persqueue_new_schemecache_ut.cpp --- .../persqueue_v1/persqueue_new_schemecache_ut.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp b/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp index 9df02407fe60..7beb4a54da1b 100644 --- a/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp +++ b/ydb/services/persqueue_v1/persqueue_new_schemecache_ut.cpp @@ -506,7 +506,7 @@ namespace NKikimr::NPersQueueTests { Y_UNIT_TEST_SUITE(TPersqueueDataPlaneTestSuite) { Y_UNIT_TEST(WriteSession) { - TPersQueueV1TestServer server(true, true); + TPersQueueV1TestServer server({.CheckACL=true, .TenantModeEnabled=true}); TString topic = "/Root/account1/write_topic"; TString consumer = "consumer_aba"; @@ -570,7 +570,7 @@ namespace NKikimr::NPersQueueTests { Y_UNIT_TEST_SUITE(TPersqueueControlPlaneTestSuite) { Y_UNIT_TEST(SetupReadLockSessionWithDatabase) { - TPersQueueV1TestServer server(false, true); + TPersQueueV1TestServer server({.TenantModeEnabled=true}); { auto res = server.PersQueueClient->AddReadRule("/Root/acc/topic1", TAddReadRuleSettings().ReadRule(TReadRuleSettings().ConsumerName("user1"))); @@ -606,7 +606,7 @@ namespace NKikimr::NPersQueueTests { } Y_UNIT_TEST(SetupWriteLockSessionWithDatabase) { - TPersQueueV1TestServer server(false, true); + TPersQueueV1TestServer server({.TenantModeEnabled=true}); auto stub = Ydb::PersQueue::V1::PersQueueService::NewStub(server.InsecureChannel); grpc::ClientContext grpcContext; @@ -631,7 +631,7 @@ namespace NKikimr::NPersQueueTests { } Y_UNIT_TEST(TestAddRemoveReadRule) { - TPersQueueV1TestServer server(false, true); + TPersQueueV1TestServer server({.TenantModeEnabled=true}); SET_LOCALS; pqClient->CreateConsumer("goodUser"); From 7b077faa0f41d4ca333f2da057d777a4e354b750 Mon Sep 17 00:00:00 2001 From: Alexander Kotov Date: Wed, 15 May 2024 14:18:31 +0300 Subject: [PATCH 5/5] [*] TCommonTests::CreateServer --- ydb/services/persqueue_v1/ut/persqueue_common_tests.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h index fda8300d402b..6b7c5f00e686 100644 --- a/ydb/services/persqueue_v1/ut/persqueue_common_tests.h +++ b/ydb/services/persqueue_v1/ut/persqueue_common_tests.h @@ -51,7 +51,7 @@ class TCommonTests { {} TPersQueueV1TestServer CreateServer() { - return TPersQueueV1TestServer({.CheckACL=false, .TenantModeEnabled=TenantModeEnabled}); + return TPersQueueV1TestServer({.TenantModeEnabled=TenantModeEnabled}); } TPersQueueV1TestServerWithRateLimiter CreateServerWithRateLimiter() {