Fix build

WeDataSphere · Nov 3, 2024 · fa3575e · fa3575e
1 parent 3208168
commit fa3575e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/...nager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java b/...nager/src/main/java/org/apache/linkis/manager/rm/external/yarn/YarnResourceRequester.java
@@ -234,7 +234,7 @@ public YarnQueueInfo getResources(
         JsonNode childQueues = getChildQueues(schedulerInfo.path("rootQueue"));
         queue = getQueue(childQueues, realQueueName);
       }
-      if (queue != null || !queue.isPresent()) {
+      if (queue == null || !queue.isPresent()) {
         logger.debug(
             "cannot find any information about queue " + queueName + ", response: " + resp);
         throw new RMWarnException(

diff --git a/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml b/linkis-dist/helm/charts/linkis/templates/configmap-linkis-config.yaml
@@ -324,7 +324,7 @@ data:
     ##mybatis
     wds.linkis.server.mybatis.mapperLocations=classpath*:mapper/common/*.xml,classpath*:mapper/mysql/*.xml
     wds.linkis.server.mybatis.typeAliasesPackage=
-    wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.engineplugin.server.dao
+    wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.publicservice.common.lock.dao,org.apache.linkis.engineplugin.server.dao
 
     linkis.engineConn.plugin.cache.expire-in-seconds=100000
     wds.linkis.engineconn.dist.load.enable=true

diff --git a/linkis-dist/package/conf/linkis-cg-linkismanager.properties b/linkis-dist/package/conf/linkis-cg-linkismanager.properties
@@ -17,7 +17,7 @@
 #
 ##mybatis
 wds.linkis.server.mybatis.typeAliasesPackage=
-wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.engineplugin.server.dao
+wds.linkis.server.mybatis.BasePackage=org.apache.linkis.manager.dao,org.apache.linkis.manager.rm.external.dao,org.apache.linkis.publicservice.common.lock.dao,org.apache.linkis.engineplugin.server.dao
 
 linkis.engineConn.plugin.cache.expire-in-seconds=100000
 wds.linkis.engineconn.dist.load.enable=true

diff --git a/...s-publicservice/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala b/...s-publicservice/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala
@@ -98,12 +98,6 @@ class PathValidator extends Logging {
     if (path.contains("../")) {
       throw new WorkSpaceException(80026, "Relative path not allowed")
     }
-    if (!(path.contains(userLocalRootPath)) && !(path.contains(userHdfsRootPath))) {
-      throw new WorkSpaceException(
-        80027,
-        "The path needs to be within the user's own workspace path"
-      )
-    }
   }
 
   def validate(args: Array[Object], paramNames: Array[String]): Unit = {