This is an automated email from the ASF dual-hosted git repository.
leebai pushed a commit to branch dev-1.0.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.0.3 by this push:
new 0e857ab Added successful and failed ecm registration responses close
#1221
new 965a04e Merge pull request #1222 from peacewong/dev-1.0.3-lm
0e857ab is described below
commit 0e857ab379eb09de30bbb944357c398c8b3d660f
Author: peacewong <[email protected]>
AuthorDate: Tue Dec 21 11:56:43 2021 +0800
Added successful and failed ecm registration responses close #1221
---
.../linkis/manager/am/service/em/DefaultEMRegisterService.scala | 2 +-
.../org/apache/linkis/manager/am/service/em/EMRegisterService.scala | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
index 6149f8b..dabda47 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/DefaultEMRegisterService.scala
@@ -71,7 +71,7 @@ class DefaultEMRegisterService extends EMRegisterService with
Logging {
*/
@Receiver
@Order(1)
- override def addEMNodeInstance(emRegister: RegisterEMRequest, smc:
ServiceMethodContext): Unit = Utils.tryCatch{
+ override def addEMNodeInstance(emRegister: RegisterEMRequest, smc:
ServiceMethodContext): RegisterEMResponse = Utils.tryCatch{
info(s"Start to save em{${emRegister.getServiceInstance}} in persistence")
emNodeManager.addEMNodeInstance(registerEMRequest2EMNode(emRegister))
info(s"Finished to save em{${emRegister.getServiceInstance}} in
persistence")
diff --git
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/EMRegisterService.scala
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/EMRegisterService.scala
index 4de56f9..e1589ae 100644
---
a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/EMRegisterService.scala
+++
b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/service/em/EMRegisterService.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.manager.am.service.em
-import org.apache.linkis.manager.common.protocol.em.RegisterEMRequest
+import org.apache.linkis.manager.common.protocol.em.{RegisterEMRequest,
RegisterEMResponse}
import org.apache.linkis.message.builder.ServiceMethodContext
@@ -25,10 +25,10 @@ trait EMRegisterService {
/**
- * EM注册请求的第一个处理的请求，用于插入Instance信息
+ * Process ecm registration request, complete the registration of instance,
label, resource and other information
*
* @param emRegister
*/
- def addEMNodeInstance(emRegister: RegisterEMRequest, scm:
ServiceMethodContext): Unit
+ def addEMNodeInstance(emRegister: RegisterEMRequest, scm:
ServiceMethodContext): RegisterEMResponse
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
