Fix bug #403

JackChen0810 · JackChen0810 · commit 3c85a0b27399 · 2021-08-31T22:08:50.000+08:00
diff --git a/dss-appconn/linkis-appconn-engineplugin/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala b/dss-appconn/linkis-appconn-engineplugin/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/appconn/executor/AppConnEngineConnExecutor.scala
@@ -123,7 +123,12 @@ class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {
   }
 
   private def getAppInstanceByLabels(labels: String, appConn: AppConn): Option[AppInstance] = {
-    def appInstanceList = appConn.getAppDesc.getAppInstancesByLabels(util.Arrays.asList(new EnvDSSLabel(labels)));
+    var labelStr = labels
+    if (labels.contains(LabelKeyConvertor.ROUTE_LABEL_KEY)) {
+      val labelMap = DSSCommonUtils.COMMON_GSON.fromJson(labels, classOf[util.Map[_, _]])
+      labelStr = labelMap.get(LabelKeyConvertor.ROUTE_LABEL_KEY).asInstanceOf[String]
+    }
+    def appInstanceList = appConn.getAppDesc.getAppInstancesByLabels(util.Arrays.asList(new EnvDSSLabel(labelStr)));
     if (appInstanceList != null && appInstanceList.size() > 0) {
       return Some(appInstanceList.get(0))
     }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,12 @@ class AppConnEngineConnExecutor(val id: Int) extends ComputationExecutor {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private def getAppInstanceByLabels(labels: String, appConn: AppConn): Option[AppInstance] = {`
`126`		`- def appInstanceList = appConn.getAppDesc.getAppInstancesByLabels(util.Arrays.asList(new EnvDSSLabel(labels)));`
	`126`	`+ var labelStr = labels`
	`127`	`+ if (labels.contains(LabelKeyConvertor.ROUTE_LABEL_KEY)) {`
	`128`	`+ val labelMap = DSSCommonUtils.COMMON_GSON.fromJson(labels, classOf[util.Map[_, _]])`
	`129`	`+ labelStr = labelMap.get(LabelKeyConvertor.ROUTE_LABEL_KEY).asInstanceOf[String]`
	`130`	`+ }`
	`131`	`+ def appInstanceList = appConn.getAppDesc.getAppInstancesByLabels(util.Arrays.asList(new EnvDSSLabel(labelStr)));`
`127`	`132`	`if (appInstanceList != null && appInstanceList.size() > 0) {`
`128`	`133`	`return Some(appInstanceList.get(0))`
`129`	`134`	`}`