You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/06/13 08:23:34 UTC
[linkis] branch dev-1.4.0 updated: Fix NPE bug #4621 (#4622)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new bc93a5ebc Fix NPE bug #4621 (#4622)
bc93a5ebc is described below
commit bc93a5ebcc5cc9f6ba307837a18d67acf2952e95
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue Jun 13 16:23:27 2023 +0800
Fix NPE bug #4621 (#4622)
---
.../org/apache/linkis/engineconn/common/conf/EngineConnConf.scala | 2 +-
.../linkis/manager/am/manager/DefaultEngineNodeManager.java | 5 ++---
.../am/service/impl/DefaultEngineConnStatusCallbackService.java | 1 -
.../manager/common/protocol/engine/EngineConnStatusCallback.java | 8 +-------
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
index 1518f00a6..0d7f1cab0 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConf.scala
@@ -37,7 +37,7 @@ object EngineConnConf {
val ENGINE_CONN_ONCE_HOOKS = CommonVars(
"linkis.engine.connector.once.hooks",
- "org.apache.linkis.engineconn.computation.executor.hook.ComputationEngineConnHook"
+ "org.apache.linkis.engineconn.once.executor.hook.OnceEngineConnHook"
)
val ENGINE_LAUNCH_CMD_PARAMS_USER_KEY =
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java
index e6049448e..4a0eb457c 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/manager/DefaultEngineNodeManager.java
@@ -168,11 +168,10 @@ public class DefaultEngineNodeManager implements EngineNodeManager {
RetryHandler<EngineNode> retryHandler = new DefaultRetryHandler<EngineNode>();
retryHandler.addRetryException(feign.RetryableException.class);
retryHandler.addRetryException(UndeclaredThrowableException.class);
-
// wait until engine to be available
EngineNode node = retryHandler.retry(() -> getEngineNodeInfo(engineNode), "getEngineNodeInfo");
long retryEndTime = System.currentTimeMillis() + 60 * 1000;
- while (!NodeStatus.isAvailable(node.getNodeStatus())
+ while ((node == null || !NodeStatus.isAvailable(node.getNodeStatus()))
&& System.currentTimeMillis() < retryEndTime) {
node = retryHandler.retry(() -> getEngineNodeInfo(engineNode), "getEngineNodeInfo");
try {
@@ -182,7 +181,7 @@ public class DefaultEngineNodeManager implements EngineNodeManager {
}
}
- if (!NodeStatus.isAvailable(node.getNodeStatus())) {
+ if (node == null || !NodeStatus.isAvailable(node.getNodeStatus())) {
return null;
}
if (!NodeStatus.isLocked(node.getNodeStatus())) {
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/impl/DefaultEngineConnStatusCallbackService.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/impl/DefaultEngineConnStatusCallbackService.java
index 0503e42b0..f2566328b 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/impl/DefaultEngineConnStatusCallbackService.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/impl/DefaultEngineConnStatusCallbackService.java
@@ -72,7 +72,6 @@ public class DefaultEngineConnStatusCallbackService implements EngineConnStatusC
protocol.getInitErrorMsg(),
false));
}
- logger.info("Finished to deal EngineConnStatusCallback: {}", protocol);
}
@Receiver
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineConnStatusCallback.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineConnStatusCallback.java
index 169b44631..d162257ca 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineConnStatusCallback.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/engine/EngineConnStatusCallback.java
@@ -21,13 +21,7 @@ import org.apache.linkis.common.ServiceInstance;
import org.apache.linkis.manager.common.entity.enumeration.NodeStatus;
import org.apache.linkis.protocol.message.RequestProtocol;
-/**
- * engineConn to ecm
- *
- * @param serviceInstance
- * @param status starting running
- * @param initErrorMsg
- */
+/** engineConn to LM */
public class EngineConnStatusCallback implements RequestProtocol {
private final ServiceInstance serviceInstance;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org