Skip to content
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

Jump to bottom

Optimized support for relationship between the long-lived label and the node not be deleted #1213

Merged
merged 4 commits into from Dec 16, 2021
Merged

Optimized support for relationship between the long-lived label and the node not be deleted #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b534919
the relationship between the long-lived label and the node not be del…
Dec 16, 2021
48faa95
Optimized code
Dec 16, 2021
e1a1a4e
set resource updator
Dec 16, 2021
4a19229
Merge remote-tracking branch 'origin/dev-1.0.3-codeparser' into dev-1…
Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...manager/src/main/scala/org/apache/linkis/manager/label/score/DefaultNodeLabelScorer.scala
View file
Open in desktop
Expand Up @@ -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]]()
}
}
}
3 changes: 1 addition & 2 deletions ...bel-manager/src/main/scala/org/apache/linkis/manager/label/service/NodeLabelService.scala
View file
Open in desktop
Expand Up @@ -56,6 +56,7 @@ trait NodeLabelService {
def removeLabelsFromNode(instance: ServiceInstance): Unit



/**
* Get node instances by labels
*
Expand All @@ -65,8 +66,6 @@ trait NodeLabelService {
def getNodesByLabels(labels: util.List[Label[_]]): util.List[ServiceInstance]


def removeLabelsFromNodeWithoutPermanent(instance: ServiceInstance, permanentLabel: Array[String])

def getNodesByLabel(label: Label[_]): util.List[ServiceInstance]


Expand Down
4 changes: 2 additions & 2 deletions ...manager/src/main/scala/org/apache/linkis/manager/label/service/ResourceLabelService.scala
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import org.apache.linkis.manager.label.entity.Label

trait ResourceLabelService {

def setEngineConnResourceToLabel(label: Label[_], nodeResource: NodeResource):Unit
def setEngineConnResourceToLabel(label: Label[_], nodeResource: NodeResource, source: String): Unit


/**
Expand All @@ -42,7 +42,7 @@ trait ResourceLabelService {
* @param label
* @param resource
*/
def setResourceToLabel(label: Label[_], resource: NodeResource)
def setResourceToLabel(label: Label[_], resource: NodeResource, source: String)

/**
* 通过Label 返回对应的Resource
Expand Down
4 changes: 1 addition & 3 deletions ...in/scala/org/apache/linkis/manager/label/service/impl/DefaultNodeLabelRemoveService.scala
View file
Open in desktop
Expand Up @@ -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)
Expand Down
18 changes: 12 additions & 6 deletions ...main/scala/org/apache/linkis/manager/label/service/impl/DefaultResourceLabelService.scala
View file
Open in desktop
Expand Up @@ -80,9 +80,10 @@ class DefaultResourceLabelService extends ResourceLabelService with Logging {
* @param label
* @param resource
*/
override def setResourceToLabel(label: Label[_], resource: NodeResource): Unit = {

resourceLabelPersistence.setResourceToLabel(LabelManagerUtils.convertPersistenceLabel(label), ResourceUtils.toPersistenceResource(resource))
override def setResourceToLabel(label: Label[_], resource: NodeResource, source: String): Unit = {
val persistResource = ResourceUtils.toPersistenceResource(resource)
persistResource.setUpdator(source)
resourceLabelPersistence.setResourceToLabel(LabelManagerUtils.convertPersistenceLabel(label), persistResource)
}

/**
Expand All @@ -92,6 +93,9 @@ class DefaultResourceLabelService extends ResourceLabelService with Logging {
* @return
*/
override def getResourceByLabel(label: Label[_]): NodeResource = {
if (null == label) {
return null
}
val persistenceResource = label match {
case p: PersistenceLabel => resourceLabelPersistence.getResourceByLabel(p)
case _ => resourceLabelPersistence.getResourceByLabel(LabelManagerUtils.convertPersistenceLabel(label))
Expand Down Expand Up @@ -119,12 +123,14 @@ class DefaultResourceLabelService extends ResourceLabelService with Logging {
resourceLabelPersistence.removeResourceByLabels(labels.map(LabelManagerUtils.convertPersistenceLabel))
}

override def setEngineConnResourceToLabel(label: Label[_], nodeResource: NodeResource): Unit = {
override def setEngineConnResourceToLabel(label: Label[_], nodeResource: NodeResource, source: String): Unit = {
label match {
case label:EngineInstanceLabel =>
case label: EngineInstanceLabel =>
val resource = ResourceUtils.toPersistenceResource(nodeResource)
resource.setTicketId(label.getInstance())
resourceLabelPersistence.setResourceToLabel(LabelManagerUtils.convertPersistenceLabel(label), resource)
val resourceLabel = LabelManagerUtils.convertPersistenceLabel(label)
resource.setUpdator(source)
resourceLabelPersistence.setResourceToLabel(resourceLabel, resource)
case _ =>
}
}
Expand Down