Skip to content

[BugFix] Fix engine reuse failure caused by empty/null engine instance (#5300) #5474

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
zhang-arvin wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

[BugFix] Fix engine reuse failure caused by empty/null engine instance (#5300) #5474

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
13 changes: 12 additions & 1 deletion ...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 @@ -226,6 +226,12 @@ class DefaultEngineReuseService extends AbstractEngineService with EngineReuseSe
}
localEngineList
} else getEngineNodeManager.getEngineNodes(instances.asScala.keys.toSeq.toArray)
if (engineScoreList == null || engineScoreList.isEmpty) {
throw new LinkisRetryException(
AMConstant.ENGINE_ERROR_CODE,
s"No engine can be reused, engineScoreList is null or empty"
)
}
logger.info(s"Task ${taskId} engineScoreList size: ${engineScoreList.length}")

// reuse EC according to template name
Expand Down Expand Up @@ -289,7 +295,12 @@ class DefaultEngineReuseService extends AbstractEngineService with EngineReuseSe
s"will be not reuse ${engine.getServiceInstance}, cause engine python version: $enginePythonVersion , param python version $pythonVersion is not match"
)
}
if (engine.getNodeResource.getUsedResource != null) {
if (engine.getNodeResource == null) {
logger.info(
s"will be not reuse ${engine.getServiceInstance}, cause engine nodeResource is null"
)
false
} else if (engine.getNodeResource.getUsedResource != null) {
// 引擎资源只有满足需要的资源才复用
pythonVersionMatch && engine.getNodeResource.getUsedResource
.notLess(resource.getMaxResource)
Expand Down