You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/23 13:23:50 UTC
[incubator-linkis] branch dev-1.1.1 updated: Fix bug that default configuration for creator won't take effect. (#1783)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
new 1eaeedd Fix bug that default configuration for creator won't take effect. (#1783)
1eaeedd is described below
commit 1eaeedd7a1d64e06f3400f4369a7574d85e65a37
Author: Alexyang <xu...@qq.com>
AuthorDate: Wed Mar 23 21:23:43 2022 +0800
Fix bug that default configuration for creator won't take effect. (#1783)
* 1. linkis-application-manager - fix DefaultEngineConnConfigurationService to support default creator params.
* #1764
1. linkis-configuration - fix bug for default creator params
---
.../manager/am/conf/ConfigurationMapCache.scala | 6 +++--
.../am/conf/EngineConnConfigurationService.scala | 4 ----
.../linkis/configuration/conf/Configuration.scala | 2 +-
.../service/ConfigurationService.scala | 26 ++++++++++++++++------
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/ConfigurationMapCache.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/ConfigurationMapCache.scala
index a6b30c4..22fe302 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/ConfigurationMapCache.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/ConfigurationMapCache.scala
@@ -20,8 +20,9 @@ package org.apache.linkis.manager.am.conf
import java.util
import org.apache.linkis.common.conf.Configuration
-import org.apache.linkis.governance.common.protocol.conf.{RequestQueryEngineConfig, RequestQueryGlobalConfig, ResponseQueryConfig}
+import org.apache.linkis.governance.common.protocol.conf.{RequestQueryEngineConfig, RequestQueryGlobalConfig, RequestQueryEngineConfigWithGlobalConfig, ResponseQueryConfig}
import org.apache.linkis.manager.label.entity.engine.{EngineTypeLabel, UserCreatorLabel}
+import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
import org.apache.linkis.protocol.CacheableProtocol
import org.apache.linkis.rpc.RPCMapCache
@@ -38,10 +39,11 @@ object ConfigurationMapCache {
}
}
+
val engineMapCache = new RPCMapCache[(UserCreatorLabel, EngineTypeLabel), String, String](
Configuration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue) {
override protected def createRequest(labelTuple: (UserCreatorLabel, EngineTypeLabel)): CacheableProtocol =
- RequestQueryEngineConfig(labelTuple._1, labelTuple._2)
+ RequestQueryEngineConfigWithGlobalConfig(labelTuple._1, labelTuple._2)
override protected def createMap(any: Any): util.Map[String, String] = any match {
case response: ResponseQueryConfig => response.getKeyAndValue
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/EngineConnConfigurationService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/EngineConnConfigurationService.scala
index c812668..cb13ed1 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/EngineConnConfigurationService.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/EngineConnConfigurationService.scala
@@ -43,10 +43,6 @@ class DefaultEngineConnConfigurationService extends EngineConnConfigurationServi
val engineTypeLabelOption = label.find(_.isInstanceOf[EngineTypeLabel])
if (userCreatorLabelOption.isDefined) {
val userCreatorLabel = userCreatorLabelOption.get.asInstanceOf[UserCreatorLabel]
- val globalConfig = Utils.tryAndWarn(ConfigurationMapCache.globalMapCache.getCacheMap(userCreatorLabel))
- if (null != globalConfig) {
- properties.putAll(globalConfig)
- }
if (engineTypeLabelOption.isDefined) {
val engineTypeLabel = engineTypeLabelOption.get.asInstanceOf[EngineTypeLabel]
val engineConfig = Utils.tryAndWarn(ConfigurationMapCache.engineMapCache.getCacheMap((userCreatorLabel, engineTypeLabel)))
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
index 4fd9880..bbf553d 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/conf/Configuration.scala
@@ -35,7 +35,7 @@ object Configuration {
val GLOBAL_CONF_LABEL = "*-*,*-*"
- val USE_CREATOR_DEFAULE_VALUE = CommonVars.apply("wds.linkis.configuration.use.creator.default.value", false).getValue
+ val USE_CREATOR_DEFAULE_VALUE = CommonVars.apply("wds.linkis.configuration.use.creator.default.value", true).getValue
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
index b552c4f..577b8e9 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/scala/org/apache/linkis/configuration/service/ConfigurationService.scala
@@ -228,7 +228,7 @@ class ConfigurationService extends Logging {
defaultConfig.setIsUserDefined(false)
configs.asScala.foreach(config => {
if(config.getKey != null && config.getKey.equals(defaultConfig.getKey)){
- if(config.getConfigValue != null){
+ if(StringUtils.isNotBlank(config.getConfigValue)) {
defaultConfig.setConfigValue(config.getConfigValue)
defaultConfig.setConfigLabelId(config.getConfigLabelId)
defaultConfig.setValueId(config.getValueId)
@@ -412,12 +412,24 @@ class ConfigurationService extends Logging {
val map = new util.HashMap[String, String]()
val allConfig = all.asScala.map(configTree => configTree.getSettings)
val userConfig = user.asScala.map(configTree => configTree.getSettings)
- if(filter != null){
- allConfig.foreach(f => f.asScala.foreach(configKeyValue => if(configKeyValue.getKey.contains(filter)) map.put(configKeyValue.getKey,configKeyValue.getDefaultValue)))
- userConfig.foreach(f => f.asScala.foreach(configKeyValue => if(configKeyValue.getKey.contains(filter) && StringUtils.isNotEmpty(configKeyValue.getConfigValue)) map.put(configKeyValue.getKey,configKeyValue.getConfigValue)))
- }else{
- allConfig.foreach(f => f.asScala.foreach(configKeyValue => map.put(configKeyValue.getKey,configKeyValue.getDefaultValue)))
- userConfig.foreach(f => f.asScala.foreach(configKeyValue => if(StringUtils.isNotEmpty(configKeyValue.getConfigValue))map.put(configKeyValue.getKey,configKeyValue.getConfigValue)))
+ if (filter != null) {
+ allConfig.foreach(f => f.asScala.foreach(configKeyValue => if (configKeyValue.getKey.contains(filter)) map.put(configKeyValue.getKey, configKeyValue.getDefaultValue)))
+ userConfig.foreach(f => f.asScala.foreach(configKeyValue => if (configKeyValue.getKey.contains(filter)) {
+ if (StringUtils.isNotEmpty(configKeyValue.getConfigValue)) {
+ map.put(configKeyValue.getKey, configKeyValue.getConfigValue)
+ } else {
+ map.put(configKeyValue.getKey, configKeyValue.getDefaultValue)
+ }
+ }))
+ } else {
+ allConfig.foreach(f => f.asScala.foreach(configKeyValue => map.put(configKeyValue.getKey, configKeyValue.getDefaultValue)))
+ userConfig.foreach(f => f.asScala.foreach(configKeyValue => {
+ if (StringUtils.isNotEmpty(configKeyValue.getConfigValue)) {
+ map.put(configKeyValue.getKey, configKeyValue.getConfigValue)
+ } else {
+ map.put(configKeyValue.getKey, configKeyValue.getDefaultValue)
+ }
+ }))
}
/*此处的用户配置会覆盖默认的配置*/
map
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org