You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/03/19 04:44:57 UTC
[incubator-linkis] 02/07: Unified parameter definition wds.linkis.governance.station.admin #1750
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 0ea6c50eefe80741012a61b826d485a69f2d6e52
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 15:45:02 2022 +0800
Unified parameter definition wds.linkis.governance.station.admin #1750
---
.../src/main/scala/org/apache/linkis/common/conf/Configuration.scala | 2 ++
.../scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala | 4 ++--
.../main/scala/org/apache/linkis/resourcemanager/utils/RMUtils.scala | 5 ++---
.../scala/org/apache/linkis/configuration/conf/Configuration.scala | 4 ++--
.../linkis/instance/label/service/conf/InstanceConfigration.scala | 4 ++--
.../org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala | 4 ++--
.../org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java | 3 ++-
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
index b649dfe..4948bfa 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
@@ -45,6 +45,8 @@ object Configuration extends Logging {
//read from env
val EUREKA_PREFER_IP = CommonVars("EUREKA_PREFER_IP", false).getValue
+ val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+
def getGateWayURL(): String = {
val url = GATEWAY_URL.getValue.trim
val gatewayUr = if (url.endsWith("/")) {
diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala
index ace3707..8919612 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/am/conf/AMConfiguration.scala
@@ -17,14 +17,14 @@
package org.apache.linkis.manager.am.conf
-import org.apache.linkis.common.conf.{CommonVars, TimeType}
+import org.apache.linkis.common.conf.{CommonVars, Configuration, TimeType}
import org.apache.linkis.common.utils.Utils
import org.apache.linkis.manager.common.entity.enumeration.MaintainType
object AMConfiguration {
- val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
val ECM_ADMIN_OPERATIONS = CommonVars("wds.linkis.governance.admin.operations", "")
diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/utils/RMUtils.scala b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/utils/RMUtils.scala
index 5669240..ecf8de6 100644
--- a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/utils/RMUtils.scala
+++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/utils/RMUtils.scala
@@ -17,7 +17,7 @@
package org.apache.linkis.resourcemanager.utils
-import org.apache.linkis.common.conf.{CommonVars, TimeType}
+import org.apache.linkis.common.conf.{CommonVars, Configuration, TimeType}
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.manager.common.entity.persistence.PersistenceResource
import org.apache.linkis.manager.common.entity.resource._
@@ -30,7 +30,6 @@ import org.json4s.DefaultFormats
import org.json4s.jackson.Serialization.{read, write}
import java.util
-
import scala.collection.JavaConverters.asScalaBufferConverter
object RMUtils extends Logging {
@@ -51,7 +50,7 @@ object RMUtils extends Logging {
val EXTERNAL_RESOURCE_REFRESH_TIME = CommonVars("wds.linkis.manager.rm.external.resource.regresh.time", new TimeType("30m"))
- val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
val COMBINED_USERCREATOR_ENGINETYPE = "combined_userCreator_engineType"
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 d1a935a..7bbbfcd 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
@@ -17,7 +17,7 @@
package org.apache.linkis.configuration.conf
-import org.apache.linkis.common.conf.CommonVars
+import org.apache.linkis.common.conf.{CommonVars, Configuration}
import org.apache.linkis.manager.label.entity.engine.EngineType
import scala.collection.JavaConverters.asScalaBufferConverter
@@ -37,7 +37,7 @@ object Configuration {
val USE_CREATOR_DEFAULE_VALUE = CommonVars.apply("wds.linkis.configuration.use.creator.default.value", false).getValue
- val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
}
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala b/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
index 8d96129..7916c8c 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/conf/InstanceConfigration.scala
@@ -17,11 +17,11 @@
package org.apache.linkis.instance.label.service.conf
-import org.apache.linkis.common.conf.CommonVars
+import org.apache.linkis.common.conf.Configuration
object InstanceConfigration {
- val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
}
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
index 836a8a2..e3fddd1 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/conf/JobhistoryConfiguration.scala
@@ -17,11 +17,11 @@
package org.apache.linkis.jobhistory.conf
-import org.apache.linkis.common.conf.CommonVars
+import org.apache.linkis.common.conf.{CommonVars, Configuration}
object JobhistoryConfiguration {
//modify this param in linkis.properties
- val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ val GOVERNANCE_STATION_ADMIN = Configuration.GOVERNANCE_STATION_ADMIN
val JOB_HISTORY_SAFE_TRIGGER = CommonVars("wds.linkis.jobhistory.safe.trigger", true).getValue
val ENTRANCE_SPRING_NAME = CommonVars("wds.linkis.entrance.spring.name", "linkis-cg-entrance")
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java b/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
index 14721da..4eb870e 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java
@@ -19,6 +19,7 @@ package org.apache.linkis.filesystem.conf;
import org.apache.linkis.common.conf.CommonVars;
import org.apache.linkis.common.conf.CommonVars$;
+import org.apache.linkis.common.conf.Configuration;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -49,7 +50,7 @@ public class WorkSpaceConfiguration {
public static final CommonVars<Boolean> FILESYSTEM_PATH_CHECK_TRIGGER =
CommonVars$.MODULE$.apply("wds.linkis.workspace.filesystem.path.check", false);
public static final CommonVars<String> FILESYSTEM_LOG_ADMIN =
- CommonVars$.MODULE$.apply("wds.linkis.governance.station.admin", "hadoop");
+ Configuration.GOVERNANCE_STATION_ADMIN();
public static final CommonVars<Boolean> FILESYSTEM_PATH_CHECK_OWNER =
CommonVars$.MODULE$.apply("wds.linkis.workspace.filesystem.owner.check", false);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org