From a4577e5e4b929e412e6fe69db780fe932e3abb0d Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Thu, 18 Jan 2024 10:15:51 +0000 Subject: [PATCH 1/5] Unmuted unit tests --- .github/config/muted_functest.txt | 1 - .github/config/muted_test.txt | 1 - .github/config/muted_ya.txt | 2 -- 3 files changed, 4 deletions(-) diff --git a/.github/config/muted_functest.txt b/.github/config/muted_functest.txt index 890053a00fe7..f14ce2afff3f 100644 --- a/.github/config/muted_functest.txt +++ b/.github/config/muted_functest.txt @@ -4,5 +4,4 @@ ydb/tests/functional/tenants/test_storage_config.py::TestStorageConfig::* ydb/tests/functional/tenants/test_tenants.py::* ydb/tests/functional/audit/* ydb/tests/functional/clickbench::test.py.test_plans* -ydb/tests/fq/s3* ydb/tests/fq/yds/test_metrics_cleanup.py::TestCleanup*test_cleanup[v1] diff --git a/.github/config/muted_test.txt b/.github/config/muted_test.txt index 1487805a7311..5d653c79c40c 100644 --- a/.github/config/muted_test.txt +++ b/.github/config/muted_test.txt @@ -5,7 +5,6 @@ ydb-tests-functional-kqp-kqp_query_session/KqpQuerySession::NoLocalAttach ydb-core-blobstorage-ut_blobstorage/VDiskAssimilation::Test ydb-core-tx-columnshard-ut_schema/TColumnShardTestSchema::ForgetAfterFail ydb-core-tx-columnshard-ut_schema/TColumnShardTestSchema::RebootForgetAfterFail -ydb-core-kqp-ut-federated_query-generic/* ydb-library-yql-sql-pg-ut/PgSqlParsingAutoparam::AutoParamValues_DifferentTypes ydb-core-blobstorage-ut_blobstorage/[6/10]* ydb/core/blobstorage/ut_blobstorage/Defragmentation::DoesItWork diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt index f39c2ec99250..f5d11cd05106 100644 --- a/.github/config/muted_ya.txt +++ b/.github/config/muted_ya.txt @@ -12,7 +12,6 @@ ydb/core/persqueue/ut [31/40]* ydb/core/persqueue/ut TPersQueueMirrorer.TestBasicRemote ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadBasicSecretValueFromExternalDataSourceMetadata -ydb/core/kqp/ut/federated_query/generic * ydb/core/kqp/ut/olap * ydb/core/kqp/ut/scan KqpRequestContext.TraceIdInErrorMessage ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns @@ -35,7 +34,6 @@ ydb/services/ydb/table_split_ut YdbTableSplit.SplitByLoadWithReadsMultipleSplits ydb/services/ydb/ut YdbOlapStore.LogPagingAfter-NotNull ydb/tests/fq/generic * ydb/tests/fq/restarts test_insert_restarts.py.TestS3.test_atomic_upload_commit* -ydb/tests/fq/s3 * ydb/tests/fq/yds test_metrics_cleanup.py.TestCleanup.test_cleanup[v1] ydb/tests/functional/audit * ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication[mirror-3-dc] From d3ae24074756b411b7cc037596e2bfd4af97cda7 Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Thu, 18 Jan 2024 17:28:16 +0000 Subject: [PATCH 2/5] Fixed ya make --- ydb/core/kqp/ut/federated_query/generic/ya.make | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ydb/core/kqp/ut/federated_query/generic/ya.make b/ydb/core/kqp/ut/federated_query/generic/ya.make index 3c5d43c2aa38..407624f56540 100644 --- a/ydb/core/kqp/ut/federated_query/generic/ya.make +++ b/ydb/core/kqp/ut/federated_query/generic/ya.make @@ -40,6 +40,16 @@ PEERDIR( INCLUDE(${ARCADIA_ROOT}/library/recipes/docker_compose/recipe.inc) +# Including of docker_compose/recipe.inc automatically converts these tests into LARGE, +# which makes it impossible to run them during precommit checks on Github CI. +# Next several lines forces these tests to be MEDIUM. To see discussion, visit YDBOPS-8928. + +IF (OPENSOURCE) + SIZE(MEDIUM) + SET(TEST_TAGS_VALUE) + SET(TEST_REQUIREMENTS_VALUE) +ENDIF() + YQL_LAST_ABI_VERSION() END() From f962f98648bc8e690f20e0ed19ce7e153a754690 Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Fri, 19 Jan 2024 07:24:55 +0000 Subject: [PATCH 3/5] Removed skip --- ydb/tests/fq/s3/test_s3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/tests/fq/s3/test_s3.py b/ydb/tests/fq/s3/test_s3.py index d0ed8814bc93..6a825d9e2169 100644 --- a/ydb/tests/fq/s3/test_s3.py +++ b/ydb/tests/fq/s3/test_s3.py @@ -359,7 +359,7 @@ def wait_checkpoints(require_query_is_on=False): @pytest.mark.parametrize("kikimr", [{"compute": 3}], indirect=True) def test_write_result(self, kikimr, s3, client, yq_version): - pytest.skip("Test is not stable in OSS") + # pytest.skip("Test is not stable in OSS") resource = boto3.resource( "s3", From 683d198196cc2710432ee201b012e074521e45b2 Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Sat, 20 Jan 2024 16:52:48 +0000 Subject: [PATCH 4/5] Fixed test_write_result --- ydb/tests/fq/s3/test_s3.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/tests/fq/s3/test_s3.py b/ydb/tests/fq/s3/test_s3.py index 6a825d9e2169..3ac7339123bc 100644 --- a/ydb/tests/fq/s3/test_s3.py +++ b/ydb/tests/fq/s3/test_s3.py @@ -358,9 +358,6 @@ def wait_checkpoints(require_query_is_on=False): @pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True) @pytest.mark.parametrize("kikimr", [{"compute": 3}], indirect=True) def test_write_result(self, kikimr, s3, client, yq_version): - - # pytest.skip("Test is not stable in OSS") - resource = boto3.resource( "s3", endpoint_url=s3.s3_url, @@ -386,8 +383,11 @@ def test_write_result(self, kikimr, s3, client, yq_version): fruit += "A" + str(j) + ",1,1\n" s3_client.put_object(Body=fruit, Bucket='wbucket', Key='fruits' + str(j) + '.csv', ContentType='text/plain') kikimr.control_plane.wait_bootstrap(1) + kikimr.compute_plane.wait_bootstrap() client.create_storage_connection("fruitbucket", "wbucket") + time.sleep(10) + sql = R''' SELECT Fruit, sum(Price) as Price, sum(Weight) as Weight FROM fruitbucket.`fruits*` From 89abf68c5e2c9a652f9cbedc4da29ab961d90708 Mon Sep 17 00:00:00 2001 From: Grigoriy Pisarenko Date: Tue, 23 Jan 2024 08:17:04 +0000 Subject: [PATCH 5/5] Added comment --- ydb/tests/fq/s3/test_s3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/tests/fq/s3/test_s3.py b/ydb/tests/fq/s3/test_s3.py index 3ac7339123bc..091f9efc90af 100644 --- a/ydb/tests/fq/s3/test_s3.py +++ b/ydb/tests/fq/s3/test_s3.py @@ -386,7 +386,7 @@ def test_write_result(self, kikimr, s3, client, yq_version): kikimr.compute_plane.wait_bootstrap() client.create_storage_connection("fruitbucket", "wbucket") - time.sleep(10) + time.sleep(10) # 2 x node info update period sql = R''' SELECT Fruit, sum(Price) as Price, sum(Weight) as Weight