Skip to content

Commit d859b69

Browse files
committed
Fixed fq config
1 parent 3fe0cbe commit d859b69

File tree

3 files changed

+76
-60
lines changed

3 files changed

+76
-60
lines changed

ydb/tests/tools/fqrun/configuration/fq_config.conf

Lines changed: 71 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ EnableTaskCounters: true
44

55
CheckpointCoordinator {
66
Enabled: true
7+
CheckpointingPeriodMillis: 30000
8+
MaxInflight: 1
9+
10+
CheckpointGarbageConfig {
11+
Enabled: true
12+
}
713

814
Storage {
915
TablePrefix: "yq/checkpoints"
@@ -16,13 +22,22 @@ CheckpointCoordinator {
1622
Common {
1723
YdbMvpCloudEndpoint: "https://ydbc.ydb.cloud.yandex.net:8789/ydbc/cloud-prod"
1824
MdbGateway: "https://mdb.api.cloud.yandex.net:443"
25+
MdbTransformHost: false
1926
ObjectStorageEndpoint: "https://storage.yandexcloud.net"
2027
IdsPrefix: "kr"
2128
QueryArtifactsCompressionMethod: "zstd_6"
2229
MonitoringEndpoint: "monitoring.api.cloud.yandex.net"
2330
KeepInternalErrors: true
2431
UseNativeProtocolForClickHouse: true
2532
ShowQueryTimeline: true
33+
MaxTasksPerOperation: 400
34+
MaxTasksPerStage: 50
35+
PqReconnectPeriod: "30m"
36+
37+
YdbDriverConfig {
38+
ClientThreadsNum: 6
39+
NetworkThreadsNum: 6
40+
}
2641
}
2742

2843
ControlPlaneProxy {
@@ -32,6 +47,15 @@ ControlPlaneProxy {
3247
ControlPlaneStorage {
3348
Enabled: true
3449
StatsMode: STATS_MODE_PROFILE
50+
DumpRawStatistics: true
51+
TasksBatchSize: 100
52+
NumTasksProportion: 4
53+
AnalyticsRetryCounterLimit: 20
54+
StreamingRetryCounterLimit: 20
55+
AnalyticsRetryCounterUpdateTime: "1d"
56+
StreamingRetryCounterUpdateTime: "1d"
57+
TaskLeaseTtl: "30s"
58+
DisableCurrentIam: false
3559

3660
AvailableConnection: "OBJECT_STORAGE"
3761
AvailableConnection: "DATA_STREAMS"
@@ -78,65 +102,13 @@ Gateways {
78102

79103
Dq {
80104
DefaultSettings {
81-
Name: "EnableComputeActor"
105+
Name: "HashShuffleTasksRatio"
82106
Value: "1"
83107
}
84108
DefaultSettings {
85-
Name: "ComputeActorType"
86-
Value: "async"
87-
}
88-
DefaultSettings {
89-
Name: "AnalyzeQuery"
90-
Value: "true"
91-
}
92-
DefaultSettings {
93-
Name: "MaxTasksPerStage"
94-
Value: "200"
95-
}
96-
DefaultSettings {
97-
Name: "MaxTasksPerOperation"
98-
Value: "200"
99-
}
100-
DefaultSettings {
101-
Name: "EnableInsert"
102-
Value: "true"
103-
}
104-
DefaultSettings {
105-
Name: "_EnablePrecompute"
106-
Value: "true"
107-
}
108-
DefaultSettings {
109-
Name: "UseAggPhases"
110-
Value: "true"
111-
}
112-
DefaultSettings {
113-
Name: "HashJoinMode"
114-
Value: "grace"
115-
}
116-
DefaultSettings {
117-
Name: "UseFastPickleTransport"
118-
Value: "true"
119-
}
120-
DefaultSettings {
121-
Name: "UseOOBTransport"
109+
Name: "UseFinalizeByKey"
122110
Value: "true"
123111
}
124-
DefaultSettings {
125-
Name: "UseWideChannels"
126-
Value: "true"
127-
}
128-
DefaultSettings {
129-
Name: "_SkipRevisionCheck"
130-
Value: "true"
131-
}
132-
DefaultSettings {
133-
Name: "EnableDqReplicate"
134-
Value: "true"
135-
}
136-
DefaultSettings {
137-
Name: "_TableTimeout"
138-
Value: "600000"
139-
}
140112
}
141113

142114
Generic {
@@ -173,8 +145,8 @@ Gateways {
173145
Endpoint: "localhost:2135"
174146
Database: "local"
175147
ClusterType: CT_DATA_STREAMS
176-
UseSsl: True
177-
SharedReading: True
148+
UseSsl: true
149+
SharedReading: true
178150
ReadGroup: "fqrun"
179151
}
180152
}
@@ -200,6 +172,15 @@ Gateways {
200172
MinDesiredDirectoriesOfFilesPerQuery: 1000
201173
RegexpCacheSize: 100
202174

175+
FormatSizeLimit {
176+
Name: "parquet"
177+
FileSizeLimit: 52428800
178+
}
179+
FormatSizeLimit {
180+
Name: "raw"
181+
FileSizeLimit: 52428800
182+
}
183+
203184
DefaultSettings {
204185
Name: "AtomicUploadCommit"
205186
Value: "true"
@@ -208,10 +189,6 @@ Gateways {
208189
Name: "UseBlocksSource"
209190
Value: "true"
210191
}
211-
DefaultSettings {
212-
Name: "UseRuntimeListing"
213-
Value: "true"
214-
}
215192
}
216193

217194
YqlCore {
@@ -224,6 +201,10 @@ Gateways {
224201
}
225202
}
226203

204+
Health {
205+
Enabled: true
206+
}
207+
227208
NodesManager {
228209
Enabled: true
229210
}
@@ -234,6 +215,7 @@ PendingFetcher {
234215

235216
PrivateApi {
236217
Enabled: true
218+
Loopback: true
237219
}
238220

239221
PrivateProxy {
@@ -242,6 +224,23 @@ PrivateProxy {
242224

243225
QuotasManager {
244226
Enabled: true
227+
QuotaDescriptions {
228+
SubjectType: "cloud"
229+
MetricName: "yq.cpuPercent.count"
230+
HardLimit: 7500
231+
DefaultLimit: 3500
232+
}
233+
QuotaDescriptions {
234+
SubjectType: "cloud"
235+
MetricName: "yq.streamingQueryDurationMinutes.count"
236+
DefaultLimit: 10080
237+
}
238+
QuotaDescriptions {
239+
SubjectType: "cloud"
240+
MetricName: "yq.analyticsQueryDurationMinutes.count"
241+
HardLimit: 1440
242+
DefaultLimit: 30
243+
}
245244
}
246245

247246
RateLimiter {
@@ -261,14 +260,26 @@ RateLimiter {
261260
}
262261
}
263262

263+
ReadActorsFactoryConfig {
264+
PqReadActorFactoryConfig {
265+
CookieCommitMode: false
266+
}
267+
}
268+
264269
ResourceManager {
265270
Enabled: true
271+
MkqlInitialMemoryLimit: 16777216
272+
MkqlTotalMemoryLimit: 193273528320
273+
MkqlAllocSize: 16777216
274+
MkqlTaskHardMemoryLimit: 24696061952
266275
}
267276

268277
RowDispatcher {
269278
Enabled: true
270279
SendStatusPeriodSec: 10
271280
TimeoutBeforeStartSessionSec: 10
281+
MaxSessionUsedMemory: 16000000
282+
WithoutConsumer: false
272283

273284
CompileService {
274285
ParallelCompilationLimit: 20

ydb/tests/tools/fqrun/src/fq_setup.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ class TFqSetup::TImpl {
111111
nodesMenagerConfig->SetPort(grpcPort);
112112
nodesMenagerConfig->SetHost("localhost");
113113

114+
auto* healthConfig = fqConfig.MutableHealth();
115+
healthConfig->SetPort(grpcPort);
116+
healthConfig->SetDatabase(database);
117+
114118
if (Settings.EmulateS3) {
115119
fqConfig.MutableCommon()->SetObjectStorageEndpoint("file://");
116120
}

ydb/tests/tools/fqrun/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ PEERDIR(
1717

1818
PEERDIR(
1919
yql/essentials/udfs/common/compress_base
20+
yql/essentials/udfs/common/re2
2021
)
2122

2223
YQL_LAST_ABI_VERSION()

0 commit comments

Comments
 (0)