Skip to content

Commit 821ddf1

Browse files
committed
#AI commit# 开发阶段: 优化日志英文打印
1 parent d037626 commit 821ddf1

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

  • linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine

linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class DefaultEngineCreateService
199199

200200
// 2 select suite ecm
201201
val emNode = selectECM(engineCreateRequest, labelList)
202-
// 3. 智能队列选择(在创建 YarnResource 之前执行)
202+
// 3. Smart queue selection (executed before creating YarnResource)
203203
performSmartQueueSelection(engineCreateRequest.getProperties, labelList)
204204

205205
// 4. generate Resource
@@ -420,12 +420,13 @@ class DefaultEngineCreateService
420420
}
421421

422422
/**
423-
* 智能队列选择:在创建 YarnResource 之前执行,确保队列配置正确 通过查询备用队列资源使用率,决定使用主队列还是备用队列
423+
* Smart queue selection: executed before creating YarnResource to ensure correct queue configuration
424+
* Decides whether to use primary queue or secondary queue by checking secondary queue resource usage
424425
*
425426
* @param properties
426-
* 任务参数
427+
* Task parameters
427428
* @param labelList
428-
* 标签列表
429+
* Label list
429430
*/
430431
private def performSmartQueueSelection(
431432
properties: util.Map[String, String],
@@ -450,11 +451,11 @@ class DefaultEngineCreateService
450451
.map(_.toUpperCase())
451452
.toSet
452453

453-
logger.info(s"智能队列配置 - 主队列: $primaryQueue, 备用队列: $secondaryQueue")
454+
logger.info(s"Smart queue config - primary queue: $primaryQueue, secondary queue: $secondaryQueue")
454455

455-
// 3. 检查是否启用第二队列功能
456+
// 3. Check if secondary queue feature is enabled
456457
if (!enabled || StringUtils.isBlank(secondaryQueue) || StringUtils.isBlank(primaryQueue)) {
457-
logger.info("智能队列选择未启用或备用队列为空,使用主队列")
458+
logger.info("Smart queue selection is not enabled or secondary queue is empty, using primary queue")
458459
return
459460
}
460461

@@ -484,12 +485,12 @@ class DefaultEngineCreateService
484485

485486
if (!engineMatched || !creatorMatched) {
486487
logger.info(
487-
s"引擎类型或 Creator 不在支持列表中 - engineType: $engineType (matched: $engineMatched), creator: $creator (matched: $creatorMatched)"
488+
s"Engine type or Creator not in supported list - engineType: $engineType (matched: $engineMatched), creator: $creator (matched: $creatorMatched)"
488489
)
489490
return
490491
}
491492

492-
// 6. 查询备用队列资源使用率
493+
// 6. Query secondary queue resource usage
493494
try {
494495
val labelContainer = labelResourceService.enrichLabels(labelList)
495496

@@ -518,22 +519,22 @@ class DefaultEngineCreateService
518519
} else {
519520
0.0
520521
}
521-
// 只要有一个维度超过阈值,就不使用备用队列
522+
// Do not use secondary queue if any dimension exceeds threshold
522523
val memoryOverThreshold = memoryUsage > threshold
523524
val cpuOverThreshold = cpuUsage > threshold
524525
val instanceOverThreshold = instanceUsage > threshold
525526

526527
if (memoryOverThreshold || cpuOverThreshold || instanceOverThreshold) {
527528
logger.info(
528-
s"备用队列资源使用率过高 - 内存超阈值: $memoryOverThreshold, CPU超阈值: $cpuOverThreshold, 实例超阈值: $instanceOverThreshold, 使用主队列"
529+
s"Secondary queue resource usage exceeds threshold - memory over threshold: $memoryOverThreshold, cpu over threshold: $cpuOverThreshold, instance over threshold: $instanceOverThreshold, using primary queue"
529530
)
530531
false
531532
} else {
532-
logger.info("备用队列资源充足,使用备用队列")
533+
logger.info("Secondary queue has sufficient resources, using secondary queue")
533534
true
534535
}
535536
} else {
536-
logger.warn("备用队列最大资源为空,使用主队列")
537+
logger.warn("Secondary queue max resource is empty, using primary queue")
537538
false
538539
}
539540

@@ -542,20 +543,20 @@ class DefaultEngineCreateService
542543
val oldQueue = properties.get(AMConfiguration.YARN_QUEUE_NAME_CONFIG_KEY)
543544
properties.put(AMConfiguration.YARN_QUEUE_NAME_CONFIG_KEY, selectedQueue)
544545

545-
logger.info(s"智能队列选择完成 - 原始队列: $oldQueue, 选择后队列: $selectedQueue")
546+
logger.info(s"Smart queue selection completed - original queue: $oldQueue, selected queue: $selectedQueue")
546547

547548
} else {
548-
logger.warn(s"无法获取备用队列 $secondaryQueue 的信息,使用主队列: $primaryQueue")
549+
logger.warn(s"Unable to get secondary queue $secondaryQueue information, using primary queue: $primaryQueue")
549550
}
550551

551552
} catch {
552553
case e: Exception =>
553-
logger.error(s"智能队列选择异常,使用主队列: $primaryQueue", e)
554+
logger.error(s"Exception in smart queue selection, using primary queue: $primaryQueue", e)
554555
}
555556

556557
} catch {
557558
case e: Exception =>
558-
logger.error("智能队列选择出现异常,使用原始队列配置", e)
559+
logger.error("Exception occurred during smart queue selection, using original queue configuration", e)
559560
}
560561
}
561562

0 commit comments

Comments
 (0)