This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new b127dfa66 [Bug] Fix user conf resource are not being applied (#5045)
b127dfa66 is described below
commit b127dfa668d95afb8c5de6684d2c2f6177bcd31e
Author: peacewong <[email protected]>
AuthorDate: Sun Dec 17 09:58:25 2023 +0800
[Bug] Fix user conf resource are not being applied (#5045)
* Fix user conf resuource are not being applied close #5040
* Fix datasource module build
* Update entrance ha default switch offf
---
.../apache/linkis/entrance/conf/EntranceConfiguration.scala | 4 ++--
.../org/apache/linkis/manager/rm/utils/UserConfiguration.java | 11 ++++-------
linkis-public-enhancements/distribution.xml | 4 ++--
3 files changed, 8 insertions(+), 11 deletions(-)
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 270376911..6f634bd76 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 b7629bfa4..123aa5995 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 class UserConfiguration {
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
index 0ac5bf5f8..b000fc853 100644
--- 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
