PRfix data race

fix data race

fix test-race

1 files changed, 37 insertions, 33 deletions

diff --git a/ydb/core/kqp/ut/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/kqp_scheme_ut.cpp
index ee97c8b17f3..424397379fb 100644
--- a/ydb/core/kqp/ut/kqp_scheme_ut.cpp
+++ b/ydb/core/kqp/ut/kqp_scheme_ut.cpp
@@ -102,44 +102,48 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
 
     Y_UNIT_TEST(CreateAndDropTableCheckAuditLog) {
         TStringStream logStream;
-        TKikimrRunner kikimr(TKikimrSettings().SetLogStream(&logStream));
-        kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::FLAT_TX_SCHEMESHARD, NActors::NLog::PRI_INFO);
         {
-            auto schemeClient = kikimr.GetSchemeClient();
+            TKikimrRunner kikimr(TKikimrSettings().SetLogStream(&logStream));
 
-            NYdb::NScheme::TPermissions permissions("user0@builtin", {"ydb.deprecated.create_table"});
-            AssertSuccessResult(schemeClient.ModifyPermissions("/Root",
-                    NYdb::NScheme::TModifyPermissionsSettings().AddGrantPermissions(permissions)
-                ).ExtractValueSync()
-            );
-        }
-
-        auto driverConfig = TDriverConfig()
-            .SetEndpoint(kikimr.GetEndpoint())
-            .SetAuthToken("user0@builtin");
-        auto driver = TDriver(driverConfig);
-        auto db = NYdb::NTable::TTableClient(driver);
-
-        auto session = db.CreateSession().GetValueSync().GetSession();
+            auto driverConfig = TDriverConfig()
+                .SetEndpoint(kikimr.GetEndpoint())
+                .SetAuthToken("user0@builtin");
+            auto driver = TDriver(driverConfig);
+            auto db = NYdb::NTable::TTableClient(driver);
+            auto session = db.CreateSession().GetValueSync().GetSession();
+            kikimr.GetTestServer().GetRuntime()->SetLogPriority(NKikimrServices::FLAT_TX_SCHEMESHARD, NActors::NLog::PRI_INFO);
+            
+            {
+                auto schemeClient = kikimr.GetSchemeClient();
 
-        {
-            const static TString createTableQuery = R"(
-                CREATE TABLE `/Root/Test1234/KeyValue` (
-                    Key Uint32,
-                    Value String,
-                    PRIMARY KEY(Key)
+                NYdb::NScheme::TPermissions permissions("user0@builtin", {"ydb.deprecated.create_table"});
+                AssertSuccessResult(schemeClient.ModifyPermissions("/Root",
+                        NYdb::NScheme::TModifyPermissionsSettings().AddGrantPermissions(permissions)
+                    ).ExtractValueSync()
                 );
-            )";
-            auto result = session.ExecuteSchemeQuery(createTableQuery).ExtractValueSync();
-            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
-        }
+            }
 
-        {
-            const static TString dropTableQuery = R"(
-                DROP TABLE `/Root/Test1234/KeyValue`;
-            )";
-            auto result = session.ExecuteSchemeQuery(dropTableQuery).ExtractValueSync();
-            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+            {
+                const static TString createTableQuery = R"(
+                    CREATE TABLE `/Root/Test1234/KeyValue` (
+                        Key Uint32,
+                        Value String,
+                        PRIMARY KEY(Key)
+                    );
+                )";
+                auto result = session.ExecuteSchemeQuery(createTableQuery).ExtractValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+            }
+
+            {
+                const static TString dropTableQuery = R"(
+                    DROP TABLE `/Root/Test1234/KeyValue`;
+                )";
+                auto result = session.ExecuteSchemeQuery(dropTableQuery).ExtractValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+            }
+            
+            driver.Stop(true);
         }
 
         TString line;