the relationship between the long-lived label and the node not be del…

…eted close #1212
apache · Dec 16, 2021 · b534919 · b534919
1 parent 8b5a330
commit b534919
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...manager/src/main/scala/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.scala b/...manager/src/main/scala/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.scala
@@ -147,6 +147,10 @@ class DefaultNodeLabelScorer extends NodeLabelScorer{
       case (instance, _) =>
         instance.setScore(instance.getScore + math.abs(offset))
     }
-    mapAsJavaMap(rawOutput.toMap)
+    if (null != rawOutput && rawOutput.nonEmpty) {
+      new util.HashMap[ScoreServiceInstance, util.List[PersistenceLabel]](rawOutput.toMap)
+    } else {
+      new util.HashMap[ScoreServiceInstance, util.List[PersistenceLabel]]()
+    }
   }
 }
diff --git a/...in/scala/org/apache/linkis/manager/label/service/impl/DefaultNodeLabelRemoveService.scala b/...in/scala/org/apache/linkis/manager/label/service/impl/DefaultNodeLabelRemoveService.scala
@@ -42,12 +42,10 @@ class DefaultNodeLabelRemoveService extends NodeLabelRemoveService with Logging
 
   private val labelFactory = LabelBuilderFactoryContext.getLabelBuilderFactory
 
-
   @Receiver
   override def removeNodeLabel(nodeLabelRemoveRequest: NodeLabelRemoveRequest): Unit = {
     info(s"Start to remove labels from node ${nodeLabelRemoveRequest.getServiceInstance}")
-    val permanentLabelKey = LabelCommonConfig.PERMANENT_LABEL.getValue.split(",")
-    nodeLabelService.removeLabelsFromNodeWithoutPermanent(nodeLabelRemoveRequest.getServiceInstance,permanentLabelKey)
+    nodeLabelService.removeLabelsFromNode(nodeLabelRemoveRequest.getServiceInstance)
     val persistenceLabel = if (nodeLabelRemoveRequest.isEngine) {
       val engineLabel = labelFactory.createLabel(classOf[EngineInstanceLabel])
       engineLabel.setInstance(nodeLabelRemoveRequest.getServiceInstance.getInstance)