diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala index 270376911b..6f634bd76b 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala @@ -245,7 +245,7 @@ object EntranceConfiguration { val ENABLE_HDFS_JVM_USER = CommonVars[Boolean]("linkis.entrance.enable.hdfs.jvm.user", true).getValue - val ENTRANCE_FAILOVER_ENABLED = CommonVars("linkis.entrance.failover.enable", true).getValue + val ENTRANCE_FAILOVER_ENABLED = CommonVars("linkis.entrance.failover.enable", false).getValue val ENTRANCE_FAILOVER_SCAN_INIT_TIME = CommonVars("linkis.entrance.failover.scan.init.time", 3 * 1000).getValue @@ -269,7 +269,7 @@ object EntranceConfiguration { val ENTRANCE_SHUTDOWN_FAILOVER_CONSUME_QUEUE_ENABLED = CommonVars("linkis.entrance.shutdown.failover.consume.queue.enable", true).getValue - val ENTRANCE_GROUP_SCAN_ENABLED = CommonVars("linkis.entrance.group.scan.enable", true) + val ENTRANCE_GROUP_SCAN_ENABLED = CommonVars("linkis.entrance.group.scan.enable", false) val ENTRANCE_GROUP_SCAN_INIT_TIME = CommonVars("linkis.entrance.group.scan.init.time", 3 * 1000) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/utils/UserConfiguration.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/utils/UserConfiguration.java index b7629bfa4e..123aa5995b 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/utils/UserConfiguration.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/utils/UserConfiguration.java @@ -119,14 +119,11 @@ public static Resource getUserConfiguredResource( UserCreatorLabel userCreatorLabel, EngineTypeLabel engineTypeLabel) { try { + Map labelTuple = + new HashMap(); + labelTuple.put(userCreatorLabel, engineTypeLabel); Resource userCreatorAvailableResource = - generateResource( - resourceType, - engineMapCache.getCacheMap( - buildRequestLabel( - userCreatorLabel.getUser(), - userCreatorLabel.getCreator(), - engineTypeLabel.getEngineType()))); + generateResource(resourceType, engineMapCache.getCacheMap(labelTuple)); logger.info( userCreatorLabel.getUser() + "on creator " diff --git a/linkis-public-enhancements/distribution.xml b/linkis-public-enhancements/distribution.xml index 0ac5bf5f8c..b000fc8539 100644 --- a/linkis-public-enhancements/distribution.xml +++ b/linkis-public-enhancements/distribution.xml @@ -290,10 +290,10 @@ - ./linkis-datasource/linkis-metadata-query/server/target/out/lib/service + ./linkis-datasource/linkis-datasource-manager/server/target/out/lib/service - lib/metadataquery-service + lib/metadataquery-service **/*