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:55 UTC
[incubator-linkis] branch dev-1.1.1 updated (8c7d469 -> 8953caa)
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a change to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 8c7d469 Dev 1.1.1 creator search bug (#1755)
new 07ad122 Fix ec clear issue #1748
new 0ea6c50 Unified parameter definition wds.linkis.governance.station.admin #1750
new 0cc7d14 add isAdmin method
new decaea1 update default value
new 36942f2 Support configuring Hive administrator #1757
new 80ce2b3 ECP adds API for refreshing ec materials #1758
new 8953caa fix build error
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/linkis/common/conf/Configuration.scala | 8 ++
.../linkis/ecm/core/engineconn/EngineConn.scala | 8 +-
.../impl/AbstractEngineConnLaunchService.scala | 1 +
.../entrance/conf/EntranceConfiguration.scala | 2 +-
.../linkis/manager/am/conf/AMConfiguration.scala | 4 +-
.../linkis/resourcemanager/utils/RMUtils.scala | 5 +-
.../server/restful/EnginePluginRestful.java | 77 ++++++++++++++++++++
.../impl/HiveMetaWithPermissionServiceImpl.java | 22 ++++++
.../org/apache/linkis/metadata/util/DWSConfig.java | 3 +
.../restful/api/ConfigurationRestfulApi.java | 85 +---------------------
.../linkis/configuration/conf/Configuration.scala | 2 +-
.../label/service/conf/InstanceConfigration.scala | 4 +-
.../jobhistory/conf/JobhistoryConfiguration.scala | 4 +-
.../filesystem/conf/WorkSpaceConfiguration.java | 3 +-
14 files changed, 132 insertions(+), 96 deletions(-)
create mode 100644 linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/07: Support configuring Hive administrator #1757
Posted by al...@apache.org.
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 36942f29458a848e21602cb9674a01b1bb51f5e2
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 21:26:10 2022 +0800
Support configuring Hive administrator #1757
---
.../impl/HiveMetaWithPermissionServiceImpl.java | 22 ++++++++++++++++++++++
.../org/apache/linkis/metadata/util/DWSConfig.java | 3 +++
2 files changed, 25 insertions(+)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
index 76af70a..85e107c 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/service/impl/HiveMetaWithPermissionServiceImpl.java
@@ -23,20 +23,33 @@ import org.apache.linkis.metadata.util.DWSConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.List;
import java.util.Map;
@Service
public class HiveMetaWithPermissionServiceImpl implements HiveMetaWithPermissionService {
+ private static final Logger log =
+ LoggerFactory.getLogger(HiveMetaWithPermissionServiceImpl.class);
+
@Autowired private HiveMetaDao hiveMetaDao;
+ private String adminUser = DWSConfig.HIVE_DB_ADMIN_USER.getValue();
+
@Override
public List<String> getDbsOptionalUserName(String userName) {
+ if (adminUser.equals(userName)) {
+ log.info("admin to get all dbs ");
+ return hiveMetaDao.getAllDbs();
+ }
Boolean flag = DWSConfig.HIVE_PERMISSION_WITH_lOGIN_USER_ENABLED.getValue();
if (flag) {
return hiveMetaDao.getDbsByUser(userName);
} else {
+ log.info("user {} to get all dbs no permission control", userName);
return hiveMetaDao.getAllDbs();
}
}
@@ -44,9 +57,18 @@ public class HiveMetaWithPermissionServiceImpl implements HiveMetaWithPermission
@Override
public List<Map<String, Object>> getTablesByDbNameAndOptionalUserName(Map<String, String> map) {
Boolean flag = DWSConfig.HIVE_PERMISSION_WITH_lOGIN_USER_ENABLED.getValue();
+ if (null == map) {
+ return null;
+ }
+ String userName = map.get("userName");
+ if (adminUser.equals(userName)) {
+ log.info("admin to get all dbs ");
+ hiveMetaDao.getTablesByDbName(map);
+ }
if (flag) {
return hiveMetaDao.getTablesByDbNameAndUser(map);
} else {
+ log.info("user {} to getTablesByDbName no permission control", userName);
return hiveMetaDao.getTablesByDbName(map);
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
index 2a8903e..4475924 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/util/DWSConfig.java
@@ -45,6 +45,9 @@ public class DWSConfig {
public static final CommonVars<String> DB_FILTER_KEYWORDS =
CommonVars.apply("wds.linkis.db.filter.keywords", "bak");
+ public static final CommonVars<String> HIVE_DB_ADMIN_USER =
+ CommonVars.apply("wds.linkis.metadata.hive.db.admin", "hadoop");
+
public static final String HDFS_FILE_SYSTEM_REST_ERRS =
CommonVars.apply(
"wds.linkis.hdfs.rest.errs",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/07: fix build error
Posted by al...@apache.org.
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 8953caac5c11902915098302a2827708c2f86777
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 22:02:06 2022 +0800
fix build error
---
.../restful/api/ConfigurationRestfulApi.java | 85 +---------------------
.../linkis/configuration/conf/Configuration.scala | 4 +-
2 files changed, 5 insertions(+), 84 deletions(-)
diff --git a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
index 2d2055c..6ca907d 100644
--- a/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
+++ b/linkis-public-enhancements/linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
@@ -17,7 +17,7 @@
package org.apache.linkis.configuration.restful.api;
-import org.apache.linkis.configuration.conf.Configuration;
+import org.apache.linkis.common.conf.Configuration;
import org.apache.linkis.configuration.entity.*;
import org.apache.linkis.configuration.exception.ConfigurationException;
import org.apache.linkis.configuration.service.CategoryService;
@@ -35,11 +35,7 @@ import org.apache.linkis.server.utils.ModuleUserUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -48,7 +44,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@RestController
@@ -59,9 +54,6 @@ public class ConfigurationRestfulApi {
@Autowired private CategoryService categoryService;
- private static String[] adminArray =
- Configuration.GOVERNANCE_STATION_ADMIN().getValue().split(",");
-
ObjectMapper mapper = new ObjectMapper();
private static final String NULL = "null";
@@ -89,77 +81,6 @@ public class ConfigurationRestfulApi {
return Message.ok();
}
- // TODO addKeyForCreator
-
- // @GET
- // @Path("/addKeyForCreator")
- // public Message addKeyForCreator(HttpServletRequest req,
- // @RequestParam(value="engineType",required=false) String
- // engineType,
- // @RequestParam(value="creator",required=false) String
- // creator,
- // @RequestParam(value="token",required=false) String token,
- // @RequestParam(value="keyJson",required=false) String
- // keyJson) throws ConfigurationException {
- // String username = SecurityFilter.getLoginUsername(req);
- // if(StringUtils.isEmpty(engineType) || StringUtils.isEmpty(creator) ||
- // StringUtils.isEmpty(token)){
- // throw new ConfigurationException("params cannot be empty!");
- // }
- // //todo 检验token
- // if(!token.equals(ConfigurationConfiguration.COPYKEYTOKEN)){
- // throw new ConfigurationException("token is error");
- // }
- // List<ConfigKey> keys =
- // configurationService.listKeyByCreatorAndAppName(creator,engineType);
- // if(keys.isEmpty()){
- // //判断和copyKeyFromIDE相反,只允许在有key的情况下添加
- // throw new ConfigurationException(creator + ":" + engineType + ",keys is empty
- // ,cannot add key");
- // }
- // ConfigKey configKey = BDPJettyServerHelper.gson().fromJson(keyJson, ConfigKey.class);
- // // TODO: 2019/12/30 configKey参数校验
- // configurationService.addKey(creator,engineType,configKey);
- // return Message.ok();
- // }
-
- // TODO copyKey
-
- // @GET
- // @Path("/copyKeyFromIDE")
- // public Message copyKeyFromIDE(HttpServletRequest req,
- // @RequestParam(value="appName",required=false) String
- // appName,
- // @RequestParam(value="creator",required=false) String
- // creator,
- // @RequestParam(value="token",required=false) String token)
- // throws ConfigurationException {
- // String username = SecurityFilter.getLoginUsername(req);
- // if(StringUtils.isEmpty(appName) || StringUtils.isEmpty(creator) ||
- // StringUtils.isEmpty(token)){
- // throw new ConfigurationException("params cannot be empty!");
- // }
- // //todo检验token
- // if(!token.equals(ConfigurationConfiguration.COPYKEYTOKEN)){
- // throw new ConfigurationException("token is error");
- // }
- // List<ConfigKey> keys =
- // configurationService.listKeyByCreatorAndAppName(creator,appName);
- // if(!keys.isEmpty()){
- // throw new ConfigurationException(creator + ":" + appName + ",keys is no empty,
- // cannot copy key");
- // }
- // configurationService.insertCreator(creator);
- // List<ConfigKey> IDEkeys =
- // configurationService.listKeyByCreatorAndAppName("IDE",appName);
- // if (IDEkeys.isEmpty()) {
- // throw new ConfigurationException("IDE:"+ appName + ",cannot find any key to
- // copy");
- // }
- // IDEkeys.forEach(k ->configurationService.copyKeyFromIDE(k,creator,appName));
- // return Message.ok();
- // }
-
@RequestMapping(path = "/getFullTreesByAppName", method = RequestMethod.GET)
public Message getFullTreesByAppName(
HttpServletRequest req,
@@ -316,7 +237,7 @@ public class ConfigurationRestfulApi {
}
private void checkAdmin(String userName) throws ConfigurationException {
- if (adminArray != null && !Arrays.asList(adminArray).contains(userName)) {
+ if (!Configuration.isAdmin(userName)) {
throw new ConfigurationException("only admin can modify category(只有管理员才能修改目录)");
}
}
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 7bbbfcd..4fd9880 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, Configuration}
+import org.apache.linkis.common.conf.CommonVars
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 = Configuration.GOVERNANCE_STATION_ADMIN
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/07: update default value
Posted by al...@apache.org.
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 decaea1a72f9dc38e68cbb9d8db3fda04afe715d
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 16:20:33 2022 +0800
update default value
---
.../scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 ce956ea..df4ac7d 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
@@ -61,7 +61,7 @@ object EntranceConfiguration {
*/
val DEFAULT_REQUEST_APPLICATION_NAME = CommonVars("wds.linkis.default.requestApplication.name", "IDE")
- val SQL_LIMIT_CREATOR = CommonVars("wds.linkis.sql.limit.creator", "IDE,Visualis")
+ val SQL_LIMIT_CREATOR = CommonVars("wds.linkis.sql.limit.creator", "IDE")
/**
* runType
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/07: ECP adds API for refreshing ec materials #1758
Posted by al...@apache.org.
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 80ce2b386b1465d21ded8d7cbcee490725834c25
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 21:28:49 2022 +0800
ECP adds API for refreshing ec materials #1758
---
.../server/restful/EnginePluginRestful.java | 77 ++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
new file mode 100644
index 0000000..e08c8c5
--- /dev/null
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.engineplugin.server.restful;
+
+import org.apache.linkis.common.conf.Configuration;
+import org.apache.linkis.engineplugin.server.service.EngineConnResourceService;
+import org.apache.linkis.engineplugin.server.service.RefreshEngineConnResourceRequest;
+import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RestController
+@RequestMapping(path = "/engineplugin")
+public class EnginePluginRestful {
+
+ private static final Logger log = LoggerFactory.getLogger(EnginePluginRestful.class);
+
+ @Autowired private EngineConnResourceService engineConnResourceService;
+
+ @RequestMapping(path = "/refeshAll", method = RequestMethod.GET)
+ public Message refeshAll(HttpServletRequest req) {
+ String username = ModuleUserUtils.getOperationUser(req, "refeshAll");
+ if (Configuration.isAdmin(username)) {
+ log.info("{} start to refresh all ec resource", username);
+ engineConnResourceService.refreshAll(true);
+ log.info("{} finished to refresh all ec resource", username);
+ return Message.ok().data("msg", "Refresh successfully");
+ } else {
+ return Message.error("Only administrators can operate");
+ }
+ }
+
+ @RequestMapping(path = "/refesh", method = RequestMethod.GET)
+ public Message refeshAll(
+ HttpServletRequest req,
+ @RequestParam(value = "ecType") String ecType,
+ @RequestParam(value = "version", required = false) String version) {
+ String username = ModuleUserUtils.getOperationUser(req, "refeshAll");
+ if (Configuration.isAdmin(username)) {
+ log.info("{} start to refresh {} ec resource", username, ecType);
+ RefreshEngineConnResourceRequest refreshEngineConnResourceRequest =
+ new RefreshEngineConnResourceRequest();
+ refreshEngineConnResourceRequest.setEngineConnType(ecType);
+ refreshEngineConnResourceRequest.setVersion(version);
+ engineConnResourceService.refresh(refreshEngineConnResourceRequest);
+ log.info("{} finished to refresh {} ec resource", username, ecType);
+ return Message.ok().data("msg", "Refresh successfully");
+ } else {
+ return Message.error("Only administrators can operate");
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/07: Unified parameter definition wds.linkis.governance.station.admin #1750
Posted by al...@apache.org.
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
[incubator-linkis] 01/07: Fix ec clear issue #1748
Posted by al...@apache.org.
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 07ad1227dd12260ea83cdfb4262774c9fbbd9e3a
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 12:17:27 2022 +0800
Fix ec clear issue #1748
---
.../scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala | 8 ++++++--
.../ecm/server/service/impl/AbstractEngineConnLaunchService.scala | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
index 03c74d0..0025b88 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/engineconn/EngineConn.scala
@@ -19,8 +19,8 @@ package org.apache.linkis.ecm.core.engineconn
import java.io.Closeable
import java.util
-
import org.apache.linkis.common.ServiceInstance
+import org.apache.linkis.common.utils.Utils
import org.apache.linkis.ecm.core.launch.{EngineConnLaunchRunner, EngineConnManagerEnv}
import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.entity.resource.NodeResource
@@ -70,5 +70,9 @@ trait EngineConn extends Closeable {
def getPid: String
- override def close(): Unit = {}
+ override def close(): Unit = {
+ if (null != getEngineConnLaunchRunner) {
+ Utils.tryQuietly(getEngineConnLaunchRunner.stop())
+ }
+ }
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
index cc70c45..9dcef7a 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala
@@ -103,6 +103,7 @@ abstract class AbstractEngineConnLaunchService extends EngineConnLaunchService w
future onComplete {
case Failure(t) =>
logger.error(s"init ${conn.getServiceInstance} failed.${conn.getEngineConnLaunchRunner.getEngineConnLaunch.getEngineConnManagerEnv().engineConnWorkDir}")
+ LinkisECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(conn.getTickedId, Failed))
case Success(_) =>
logger.info(s"init ${conn.getServiceInstance} succeed.${conn.getEngineConnLaunchRunner.getEngineConnLaunch.getEngineConnManagerEnv().engineConnWorkDir}")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/07: add isAdmin method
Posted by al...@apache.org.
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 0cc7d14aad00c9ce3140db7bbb55163e795bc2d7
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Mar 18 16:02:48 2022 +0800
add isAdmin method
---
.../main/scala/org/apache/linkis/common/conf/Configuration.scala | 6 ++++++
1 file changed, 6 insertions(+)
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 4948bfa..65ba753 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
@@ -47,6 +47,12 @@ object Configuration extends Logging {
val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
+ private val adminUsers = GOVERNANCE_STATION_ADMIN.getValue.split(",")
+
+ def isAdmin(username: String): Boolean = {
+ adminUsers.exists(username.equalsIgnoreCase)
+ }
+
def getGateWayURL(): String = {
val url = GATEWAY_URL.getValue.trim
val gatewayUr = if (url.endsWith("/")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org