1.8.0 features merge

linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/RSAUtils.scala

@@ -26,7 +26,7 @@ import java.nio.charset.StandardCharsets
 import java.security.{KeyPair, KeyPairGenerator, PrivateKey, PublicKey}
 
 object RSAUtils {
-  private implicit val keyPair = genKeyPair(1024)
+  private implicit val keyPair = genKeyPair(2048)
 
   def genKeyPair(keyLength: Int): KeyPair = {
     val keyPair = KeyPairGenerator.getInstance("RSA")

linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/conf/HadoopConf.scala

@@ -64,6 +64,9 @@ object HadoopConf {
   val HDFS_ENABLE_CACHE_CLOSE =
     CommonVars("linkis.hadoop.hdfs.cache.close.enable", true).getValue
 
+  val HDFS_ENABLE_NOT_CLOSE_USERS =
+    CommonVars("linkis.hadoop.hdfs.cache.not.close.users", "").getValue
+
   val HDFS_ENABLE_CACHE_IDLE_TIME =
     CommonVars("wds.linkis.hadoop.hdfs.cache.idle.time", 3 * 60 * 1000).getValue
 

linkis-commons/linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/utils/HDFSUtils.scala

@@ -68,7 +68,10 @@ object HDFSUtils extends Logging {
             .foreach { hdfsFileSystemContainer =>
               val locker = hdfsFileSystemContainer.getUser + LOCKER_SUFFIX
               locker.intern() synchronized {
-                if (hdfsFileSystemContainer.canRemove()) {
+                if (
+                    hdfsFileSystemContainer.canRemove() && !HadoopConf.HDFS_ENABLE_NOT_CLOSE_USERS
+                      .contains(hdfsFileSystemContainer.getUser)
+                ) {
                   fileSystemCache.remove(
                     hdfsFileSystemContainer.getUser + JOINT + hdfsFileSystemContainer.getLabel
                   )

linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala

@@ -83,7 +83,7 @@ class SecurityFilter extends Filter {
         ServerConfiguration.BDP_SERVER_RESTFUL_PASS_AUTH_REQUEST_URI
           .exists(r => !r.equals("") && request.getRequestURI.startsWith(r))
     ) {
-      logger.info("pass auth uri: " + request.getRequestURI)
+      logger.debug("pass auth uri: " + request.getRequestURI)
       true
     } else {
       val userName = Utils.tryCatch(SecurityFilter.getLoginUser(request)) {

linkis-commons/linkis-storage/src/main/scala/org/apache/linkis/storage/conf/LinkisStorageConf.scala

@@ -33,7 +33,7 @@ object LinkisStorageConf {
     CommonVars
       .apply(
         "wds.linkis.hdfs.rest.errs",
-        ".*Filesystem closed.*|.*Failed to find any Kerberos tgt.*"
+        ".*Filesystem closed.*|.*Failed to find any Kerberos tgt.*|.*The client is stopped.*"
       )
       .getValue
 

linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobBuilder.scala

@@ -176,7 +176,7 @@ object LinkisJobBuilder {
 
   var authTokenValue: String = CommonVars[String](
     "wds.linkis.client.test.common.tokenValue",
-    "LINKIS_CLI_TEST"
+    Configuration.LINKIS_TOKEN.getValue
   ).getValue // This is the default authToken, we usually suggest set different ones for users.
 
   def setDefaultClientConfig(clientConfig: DWSClientConfig): Unit = this.clientConfig = clientConfig

linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala

@@ -18,6 +18,7 @@
 package org.apache.linkis.computation.client.once.simple
 
 import org.apache.linkis.bml.client.{BmlClient, BmlClientFactory}
+import org.apache.linkis.common.conf.Configuration.LINKIS_TOKEN
 import org.apache.linkis.common.utils.Utils
 import org.apache.linkis.computation.client.LinkisJobBuilder
 import org.apache.linkis.computation.client.LinkisJobBuilder.clientConfig
@@ -171,7 +172,7 @@ object SimpleOnceJobBuilder {
           ) // We think 90s is enough, if SocketTimeoutException is throw, just set a new clientConfig to modify it.
           .setAuthenticationStrategy(new TokenAuthenticationStrategy())
           .setAuthTokenKey(TokenAuthenticationStrategy.TOKEN_KEY)
-          .setAuthTokenValue(LinkisJobBuilder.authTokenValue)
+          .setAuthTokenValue(LINKIS_TOKEN.getValue)
           .setDWSVersion(clientConfig.getDWSVersion)
           .build()
         bmlClient = BmlClientFactory.createBmlClient(newClientConfig)

linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/constant/job/JobRequestConstants.scala

@@ -36,4 +36,6 @@ object JobRequestConstants {
   val ENABLE_DIRECT_PUSH = "enableDirectPush"
 
   val DIRECT_PUSH_FETCH_SIZE = "direct_push_fetch_size"
+  val LINKIS_HIVE_EC_READ_RESULT_BY_OBJECT = "readResByObject"
+
 }