Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev 1.1.15 webank hive #289

Merged
merged 2 commits into from
Sep 12, 2023
Merged

Dev 1.1.15 webank hive #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98ed64
fix hive bug
aiceflower Sep 12, 2023
cb36760
code format
aiceflower Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ object RPCConfiguration {
).getValue.split(",")

val METADATAQUERY_SERVICE_APPLICATION_NAME: CommonVars[String] =
CommonVars("wds.linkis.gateway.conf.publicservice.name", "linkis-ps-metadataquery")
CommonVars("wds.linkis.gateway.conf.metadataquery.name", "linkis-ps-metadataquery")

val METADATAQUERY_SERVICE_LIST: Array[String] = CommonVars(
"wds.linkis.gateway.conf.metadataquery.list",
Expand Down
6 changes: 3 additions & 3 deletions ...ain/scala/org/apache/linkis/manager/rm/service/impl/DriverAndYarnReqResourceService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ class DriverAndYarnReqResourceService(
} catch {
case ex: Exception =>
throw new RMWarnException(
RMErrorCode.ACROSS_CLUSTER_RULE_FAILED.getErrorCode,
ex.getMessage
)
RMErrorCode.ACROSS_CLUSTER_RULE_FAILED.getErrorCode,
ex.getMessage
)
}

logger.info(s"user: $user, creator: $creator task meet the threshold rule")
Expand Down
4 changes: 2 additions & 2 deletions ...ager/src/main/scala/org/apache/linkis/manager/rm/utils/AcrossClusterRulesJudgeUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ object AcrossClusterRulesJudgeUtils extends Logging {
} else {
throw new RMWarnException(
RMErrorCode.ACROSS_CLUSTER_RULE_FAILED.getErrorCode,
s"usedCPUPercentage: $usedCPUPercentage, CPUPercentageThreshold: $CPUPercentageThreshold" +
s"usedMemoryPercentage: $usedMemoryPercentage, MemoryPercentageThreshold: $MemoryPercentageThreshold"
s"usedCPUPercentage: $usedCPUPercentage, CPUPercentageThreshold: $CPUPercentageThreshold" +
s"usedMemoryPercentage: $usedMemoryPercentage, MemoryPercentageThreshold: $MemoryPercentageThreshold"
)
}
} else {
Expand Down
3 changes: 2 additions & 1 deletion ...cript-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public class FsRestfulApi {
*/
private boolean checkIsUsersDirectory(String requestPath, String userName, Boolean withAdmin) {
// 配置文件默认关闭检查，withadmin默认true，特殊情况传false 开启权限检查（
// The configuration file defaults to disable checking, with admin defaulting to true, and in special cases, false is passed to enable permission checking）
// The configuration file defaults to disable checking, with admin defaulting to true, and in
// special cases, false is passed to enable permission checking）
boolean ownerCheck = WorkSpaceConfiguration.FILESYSTEM_PATH_CHECK_OWNER.getValue();
if (!ownerCheck && withAdmin) {
LOGGER.debug("not check filesystem owner.");
Expand Down
4 changes: 2 additions & 2 deletions ...y/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,13 @@ class DefaultGatewayParser(gatewayParsers: Array[GatewayParser]) extends Abstrac
) {
RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
// In order to be compatible with metadata module name refactoring,this logic will be removed in subsequent versions
} else if (RPCConfiguration.LINKIS_DATASOURCE_SERVICE_LIST.contains(serviceId)) {
RPCConfiguration.LINKIS_DATASOURCE_SERVICE_NAME.getValue
} else if (RPCConfiguration.METADATAQUERY_SERVICE_LIST.contains(serviceId)) {
RPCConfiguration.METADATAQUERY_SERVICE_APPLICATION_NAME.getValue
} else if (RPCConfiguration.LINKIS_MANAGER_SERVICE_LIST.contains(serviceId)) {
RPCConfiguration.LINKIS_MANAGER_SERVICE_NAME.getValue
// After the complete merge is completed, it needs to be removed
} else if (RPCConfiguration.LINKIS_DATASOURCE_SERVICE_LIST.contains(serviceId)) {
RPCConfiguration.LINKIS_DATASOURCE_SERVICE_NAME.getValue
} else {
serviceId
}
Expand Down