Specify explicit cpu requirement (speed up asan) (#10061)

maximyurchuk · web-flow · commit d4f2a484ce75 · 2024-10-03T19:21:20.000+03:00
diff --git a/ydb/tests/functional/audit/ya.make b/ydb/tests/functional/audit/ya.make
@@ -24,7 +24,7 @@ PEERDIR(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:10)
+    REQUIREMENTS(ram:10 cpu:1)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/autoconfig/ya.make b/ydb/tests/functional/autoconfig/ya.make
@@ -6,7 +6,7 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:1)
 ENDIF()
 
 TIMEOUT(600)
diff --git a/ydb/tests/functional/backup/s3_path_style/ya.make b/ydb/tests/functional/backup/s3_path_style/ya.make
@@ -23,7 +23,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc)
 SIZE(MEDIUM)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/backup/ya.make b/ydb/tests/functional/backup/ya.make
@@ -25,7 +25,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc)
 SIZE(MEDIUM)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/blobstorage/ya.make b/ydb/tests/functional/blobstorage/ya.make
@@ -9,13 +9,10 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:32)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
-    REQUIREMENTS(
-        ram:16
-    )
     TIMEOUT(1800)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/tests/functional/cms/ya.make b/ydb/tests/functional/cms/ya.make
@@ -12,7 +12,7 @@ TEST_SRCS(
 SPLIT_FACTOR(10)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/tests/functional/encryption/ya.make b/ydb/tests/functional/encryption/ya.make
@@ -19,7 +19,7 @@ PEERDIR(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:32)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/hive/ya.make b/ydb/tests/functional/hive/ya.make
@@ -8,16 +8,14 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:2)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
     TIMEOUT(1200)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:2)
     SPLIT_FACTOR(20)
 ELSE()
     TIMEOUT(600)
diff --git a/ydb/tests/functional/kqp/kqp_indexes/ya.make b/ydb/tests/functional/kqp/kqp_indexes/ya.make
@@ -19,7 +19,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 SIZE(MEDIUM)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/kqp/kqp_query_session/ya.make b/ydb/tests/functional/kqp/kqp_query_session/ya.make
@@ -24,7 +24,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 SIZE(MEDIUM)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/kqp/kqp_query_svc/ya.make b/ydb/tests/functional/kqp/kqp_query_svc/ya.make
@@ -22,7 +22,7 @@ SIZE(MEDIUM)
 TIMEOUT(30)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/limits/ya.make b/ydb/tests/functional/limits/ya.make
@@ -6,7 +6,7 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:2)
 ENDIF()
 
 TIMEOUT(600)
diff --git a/ydb/tests/functional/query_cache/ya.make b/ydb/tests/functional/query_cache/ya.make
@@ -18,8 +18,4 @@ PEERDIR(
     ydb/public/sdk/python
 )
 
-IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:11)
-ENDIF()
-
 END()
diff --git a/ydb/tests/functional/rename/ya.make b/ydb/tests/functional/rename/ya.make
@@ -16,7 +16,7 @@ FORK_SUBTESTS()
 SPLIT_FACTOR(10)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:32)
+    REQUIREMENTS(ram:32 cpu:2)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
diff --git a/ydb/tests/functional/replication/ya.make b/ydb/tests/functional/replication/ya.make
@@ -20,7 +20,7 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 SIZE(MEDIUM)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:16 cpu:4)
 ENDIF()
 
 END()
diff --git a/ydb/tests/functional/restarts/ya.make b/ydb/tests/functional/restarts/ya.make
@@ -7,7 +7,7 @@ TEST_SRCS(
 SPLIT_FACTOR(10)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:32)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make b/ydb/tests/functional/sdk/cpp/sdk_credprovider/ya.make
@@ -15,8 +15,4 @@ INCLUDE(${ARCADIA_ROOT}/ydb/public/tools/ydb_recipe/recipe.inc)
 
 SIZE(MEDIUM)
 
-IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
-ENDIF()
-
 END()
diff --git a/ydb/tests/functional/serverless/ya.make b/ydb/tests/functional/serverless/ya.make
@@ -10,7 +10,7 @@ FORK_SUBTESTS()
 TIMEOUT(600)
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:32)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/cloud/ya.make b/ydb/tests/functional/sqs/cloud/ya.make
@@ -13,9 +13,7 @@ IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:2)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/common/ya.make b/ydb/tests/functional/sqs/common/ya.make
@@ -21,9 +21,7 @@ IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:2)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/large/ya.make b/ydb/tests/functional/sqs/large/ya.make
@@ -11,9 +11,7 @@ IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:4)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make b/ydb/tests/functional/sqs/merge_split_common_table/fifo/ya.make
@@ -8,16 +8,14 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:4)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make b/ydb/tests/functional/sqs/merge_split_common_table/std/ya.make
@@ -7,7 +7,7 @@ TEST_SRCS(
 )
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:16)
+    REQUIREMENTS(ram:32 cpu:4)
 ENDIF()
 
 IF (SANITIZER_TYPE == "thread")
diff --git a/ydb/tests/functional/sqs/messaging/ya.make b/ydb/tests/functional/sqs/messaging/ya.make
@@ -12,9 +12,7 @@ IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:1)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/sqs/with_quotas/ya.make b/ydb/tests/functional/sqs/with_quotas/ya.make
@@ -11,9 +11,7 @@ IF (SANITIZER_TYPE == "thread")
     TIMEOUT(2400)
     SIZE(LARGE)
     TAG(ya:fat)
-    REQUIREMENTS(
-        ram:32
-    )
+    REQUIREMENTS(ram:32 cpu:1)
 ELSE()
     TIMEOUT(600)
     SIZE(MEDIUM)
diff --git a/ydb/tests/functional/tenants/ya.make b/ydb/tests/functional/tenants/ya.make
@@ -30,7 +30,7 @@ PEERDIR(
 FORK_SUBTESTS()
 
 IF (SANITIZER_TYPE)
-    REQUIREMENTS(ram:10)
+    REQUIREMENTS(ram:10 cpu:1)
 ENDIF()
 
 END()

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ PEERDIR(`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`IF (SANITIZER_TYPE)`
`27`		`- REQUIREMENTS(ram:10)`
	`27`	`+ REQUIREMENTS(ram:10 cpu:1)`
`28`	`28`	`ENDIF()`
`29`	`29`
`30`	`30`	`END()`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ TEST_SRCS(`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`IF (SANITIZER_TYPE)`
`9`		`- REQUIREMENTS(ram:16)`
	`9`	`+ REQUIREMENTS(ram:16 cpu:1)`
`10`	`10`	`ENDIF()`
`11`	`11`
`12`	`12`	`TIMEOUT(600)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ PEERDIR(`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`IF (SANITIZER_TYPE)`
`22`		`- REQUIREMENTS(ram:32)`
	`22`	`+ REQUIREMENTS(ram:32 cpu:4)`
`23`	`23`	`ENDIF()`
`24`	`24`
`25`	`25`	`END()`