[Bug] Fix user conf resource are not being applied (apache#5045)

* Fix user conf resuource are not being applied close apache#5040 * Fix datasource module build * Update entrance ha default switch offf
WeDataSphere · Dec 17, 2023 · b127dfa · b127dfa
1 parent 14e118a
commit b127dfa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/...inkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/...inkis-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/...plication-manager/src/main/java/org/apache/linkis/manager/rm/utils/UserConfiguration.java b/...plication-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<UserCreatorLabel, EngineTypeLabel> labelTuple =
+          new HashMap<UserCreatorLabel, EngineTypeLabel>();
+      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
@@ -290,10 +290,10 @@
     <fileSets>
         <fileSet>
             <directory>
-                ./linkis-datasource/linkis-metadata-query/server/target/out/lib/service
+                ./linkis-datasource/linkis-datasource-manager/server/target/out/lib/service
             </directory>
             <outputDirectory>
-                lib/metadataquery-service
+                    lib/metadataquery-service
             </outputDirectory>
             <includes>
                 <include>**/*</include>