Skip to content

Fix and update metrics information exception bug #5296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v-kkhuang wants to merge 1 commit into
base: dev-1.9.0
Choose a base branch
from
Open

Fix and update metrics information exception bug #5296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions ...c/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineCreateService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,30 @@ class DefaultEngineCreateService
s"Failed to update engineNode: ${t.getMessage}"
)
}
if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
val emInstance = engineNode.getServiceInstance.getInstance
val ecmInstance = engineNode.getEMNode.getServiceInstance.getInstance
// 8. Update job history metrics after successful engine creation - 异步执行
AMUtils.updateMetricsAsync(
taskId,
resourceTicketId,
emInstance,
ecmInstance,
null,
isReuse = false
Utils.tryCatch {
if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
val emInstance = engineNode.getServiceInstance.getInstance
val ecmInstance = engineNode.getEMNode.getServiceInstance.getInstance
if ((null != emInstance) && (null != ecmInstance)) {
// 8. Update job history metrics after successful engine creation - 异步执行
AMUtils.updateMetricsAsync(
taskId,
resourceTicketId,
emInstance,
ecmInstance,
null,
isReuse = false
)
} else {
logger.info(
s"CreateEngine:Failed to update metrics for emInstance: $emInstance, ecmInstance: $ecmInstance"
)
}
}
} { case e: Exception =>
logger.error(
s"Failed to update metrics for taskId: $taskId",
e
)
}
// 9. Add the Label of EngineConn, and add the Alias of engineConn
Expand Down
38 changes: 25 additions & 13 deletions ...rc/main/scala/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,19 +383,31 @@ class DefaultEngineReuseService extends AbstractEngineService with EngineReuseSe
.toJson(engine) + " from engineLabelMap : " + AMUtils.GSON.toJson(instances)
)
}
if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
val engineNode =
ecResourceInfoService.getECResourceInfoRecordByInstance(
engine.getServiceInstance.getInstance
)
// 异步更新 metrics
AMUtils.updateMetricsAsync(
taskId,
engineNode.getTicketId,
engineNode.getServiceInstance,
engineNode.getEcmInstance,
engineNode.getLogDirSuffix,
isReuse = true
Utils.tryCatch {
if (Configuration.METRICS_INCREMENTAL_UPDATE_ENABLE.getValue) {
val engineNode =
ecResourceInfoService.getECResourceInfoRecordByInstance(
engine.getServiceInstance.getInstance
)
if (null != engineNode) {
// 异步更新 metrics
AMUtils.updateMetricsAsync(
taskId,
engineNode.getTicketId,
engineNode.getServiceInstance,
engineNode.getEcmInstance,
engineNode.getLogDirSuffix,
isReuse = true
)
} else {
logger.info(s"ReuseEngine:Failed to update metrics for engineNode: $engineNode")
}

}
} { case e: Exception =>
logger.error(
s"Failed to update metrics for taskId: $taskId",
e
)
}
engine
Expand Down