From 20d0e9b81c999a03894c1e175474fd0df29a5930 Mon Sep 17 00:00:00 2001 From: casionone Date: Tue, 1 Nov 2022 22:11:16 +0800 Subject: [PATCH 1/2] fix:EC query results are inaccurate --- .../manager/rm/restful/RMMonitorRest.scala | 25 +++++-------------- .../label/entity/engine/EngineType.scala | 3 --- .../dao/impl/ECResourceRecordMapper.xml | 3 ++- 3 files changed, 8 insertions(+), 23 deletions(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala index ef7bf3378d..8ee6b21634 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala @@ -29,18 +29,9 @@ import org.apache.linkis.manager.common.utils.ResourceUtils import org.apache.linkis.manager.label.builder.CombinedLabelBuilder import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext import org.apache.linkis.manager.label.entity.cluster.ClusterLabel -import org.apache.linkis.manager.label.entity.engine.{ - EngineInstanceLabel, - EngineTypeLabel, - UserCreatorLabel -} +import org.apache.linkis.manager.label.entity.engine.{EngineInstanceLabel, EngineTypeLabel, UserCreatorLabel} import org.apache.linkis.manager.label.service.NodeLabelService -import org.apache.linkis.manager.persistence.{ - LabelManagerPersistence, - NodeManagerPersistence, - NodeMetricManagerPersistence, - ResourceManagerPersistence -} +import org.apache.linkis.manager.persistence.{LabelManagerPersistence, NodeManagerPersistence, NodeMetricManagerPersistence, ResourceManagerPersistence} import org.apache.linkis.manager.rm.domain.RMLabelContainer import org.apache.linkis.manager.rm.external.service.ExternalResourceService import org.apache.linkis.manager.rm.external.yarn.{YarnAppInfo, YarnResourceIdentifier} @@ -52,22 +43,17 @@ import org.apache.linkis.manager.service.common.metrics.MetricsConverter import org.apache.linkis.server.{BDPJettyServerHelper, Message} import org.apache.linkis.server.security.SecurityFilter import org.apache.linkis.server.utils.ModuleUserUtils - import org.apache.commons.lang3.StringUtils - import org.springframework.beans.factory.annotation.Autowired import org.springframework.web.bind.annotation._ - import javax.servlet.http.HttpServletRequest - -import java.text.SimpleDateFormat +import java.text.{MessageFormat, SimpleDateFormat} import java.util import java.util.{Comparator, TimeZone} import scala.collection.JavaConverters._ import scala.collection.mutable import scala.collection.mutable.ArrayBuffer - import com.fasterxml.jackson.databind.ObjectMapper import com.github.pagehelper.page.PageMethod import com.google.common.collect.Lists @@ -277,8 +263,9 @@ class RMMonitorRest extends Logging { val searchUsername = if (StringUtils.isEmpty(username)) "" else username val searchCreator = if (StringUtils.isEmpty(creator)) "" else creator val searchEngineType = if (StringUtils.isEmpty(engineType)) "" else engineType - val labelValuePattern = - "%" + searchCreator + "%" + "," + "%" + searchUsername + "%" + "," + "%" + searchEngineType + "%" + "," + "%" + // label value in db as :{"creator":"nodeexecution","user":"hadoop","engineType":"appconn","version":"1"} + val labelValuePattern = MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType) + if (COMBINED_USERCREATOR_ENGINETYPE == null) { val userCreatorLabel = labelFactory.createLabel(classOf[UserCreatorLabel]) val engineTypeLabel = labelFactory.createLabel(classOf[EngineTypeLabel]) diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala index 6ef1cc45a3..3550d3185d 100644 --- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala +++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineType.scala @@ -43,8 +43,6 @@ object EngineType extends Enumeration with Logging { val PIPELINE = Value("pipeline") - val ES = Value("es") - val PRESTO = Value("presto") val FLINK = Value("flink") @@ -86,7 +84,6 @@ object EngineType extends Enumeration with Logging { case _ if IO_ENGINE_FILE.toString.equalsIgnoreCase(str) => IO_ENGINE_FILE case _ if IO_ENGINE_HDFS.toString.equalsIgnoreCase(str) => IO_ENGINE_HDFS case _ if PIPELINE.toString.equalsIgnoreCase(str) => PIPELINE - case _ if ES.toString.equalsIgnoreCase(str) => ES case _ if PRESTO.toString.equalsIgnoreCase(str) => PRESTO case _ if FLINK.toString.equalsIgnoreCase(str) => FLINK case _ if APPCONN.toString.equals(str) => APPCONN diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml index 90d3165dc7..a05d5ea222 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/ECResourceRecordMapper.xml @@ -71,7 +71,8 @@ service_instance = #{instance} and create_user = #{username} - and label_value like concat('%',#{engineType},'%') + + and label_value like concat('%,',#{engineType},'%') and create_time BETWEEN #{startDate} AND #{endDate} ORDER BY linkis_cg_ec_resource_info_record.create_time DESC From f79e0a3af32776b670d1bcfa47999b87e6d80534 Mon Sep 17 00:00:00 2001 From: casionone Date: Wed, 2 Nov 2022 10:18:21 +0800 Subject: [PATCH 2/2] format code --- .../manager/rm/restful/RMMonitorRest.scala | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala index 8ee6b21634..b0430d0221 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/restful/RMMonitorRest.scala @@ -29,9 +29,18 @@ import org.apache.linkis.manager.common.utils.ResourceUtils import org.apache.linkis.manager.label.builder.CombinedLabelBuilder import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext import org.apache.linkis.manager.label.entity.cluster.ClusterLabel -import org.apache.linkis.manager.label.entity.engine.{EngineInstanceLabel, EngineTypeLabel, UserCreatorLabel} +import org.apache.linkis.manager.label.entity.engine.{ + EngineInstanceLabel, + EngineTypeLabel, + UserCreatorLabel +} import org.apache.linkis.manager.label.service.NodeLabelService -import org.apache.linkis.manager.persistence.{LabelManagerPersistence, NodeManagerPersistence, NodeMetricManagerPersistence, ResourceManagerPersistence} +import org.apache.linkis.manager.persistence.{ + LabelManagerPersistence, + NodeManagerPersistence, + NodeMetricManagerPersistence, + ResourceManagerPersistence +} import org.apache.linkis.manager.rm.domain.RMLabelContainer import org.apache.linkis.manager.rm.external.service.ExternalResourceService import org.apache.linkis.manager.rm.external.yarn.{YarnAppInfo, YarnResourceIdentifier} @@ -43,10 +52,14 @@ import org.apache.linkis.manager.service.common.metrics.MetricsConverter import org.apache.linkis.server.{BDPJettyServerHelper, Message} import org.apache.linkis.server.security.SecurityFilter import org.apache.linkis.server.utils.ModuleUserUtils + import org.apache.commons.lang3.StringUtils + import org.springframework.beans.factory.annotation.Autowired import org.springframework.web.bind.annotation._ + import javax.servlet.http.HttpServletRequest + import java.text.{MessageFormat, SimpleDateFormat} import java.util import java.util.{Comparator, TimeZone} @@ -54,6 +67,7 @@ import java.util.{Comparator, TimeZone} import scala.collection.JavaConverters._ import scala.collection.mutable import scala.collection.mutable.ArrayBuffer + import com.fasterxml.jackson.databind.ObjectMapper import com.github.pagehelper.page.PageMethod import com.google.common.collect.Lists @@ -264,7 +278,8 @@ class RMMonitorRest extends Logging { val searchCreator = if (StringUtils.isEmpty(creator)) "" else creator val searchEngineType = if (StringUtils.isEmpty(engineType)) "" else engineType // label value in db as :{"creator":"nodeexecution","user":"hadoop","engineType":"appconn","version":"1"} - val labelValuePattern = MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType) + val labelValuePattern = + MessageFormat.format("%{0}%,%{1}%,%{2}%,%", searchCreator, searchUsername, searchEngineType) if (COMBINED_USERCREATOR_ENGINETYPE == null) { val userCreatorLabel = labelFactory.createLabel(classOf[UserCreatorLabel])