Merge pull request apache#297 from WeDataSphere/dev-1.1.16-webank-fs

update setOwner
mayinrain · Oct 7, 2023 · c50600f · c50600f
2 parents 5070bff + 135c168
commit c50600f
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala
@@ -54,5 +54,4 @@ object LogUtils {
 
   val ERROR_STR = "ERROR"
 
-
 }
diff --git a/...mmons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/FileSystemUtils.scala b/...mmons/linkis-storage/src/main/scala/org/apache/linkis/storage/utils/FileSystemUtils.scala
@@ -61,6 +61,7 @@ object FileSystemUtils extends Logging {
     }(Utils.tryQuietly(fileSystem.close()))
   }
 
+  @deprecated("please use createNewFileAndSetOwnerWithFileSystem")
   def createNewFileWithFileSystem(
       fileSystem: FileSystem,
       filePath: FsPath,
@@ -82,6 +83,31 @@ object FileSystemUtils extends Logging {
     }
   }
 
+  /**
+   * create new file and set file owner by FileSystem
+   * @param fileSystem
+   * @param filePath
+   * @param user
+   * @param createParentWhenNotExists
+   */
+  def createNewFileAndSetOwnerWithFileSystem(
+      fileSystem: FileSystem,
+      filePath: FsPath,
+      user: String,
+      createParentWhenNotExists: Boolean
+  ): Unit = {
+    if (!fileSystem.exists(filePath)) {
+      if (!fileSystem.exists(filePath.getParent)) {
+        if (!createParentWhenNotExists) {
+          throw new IOException("parent dir " + filePath.getParent.getPath + " dose not exists.")
+        }
+        mkdirsAndSetOwner(fileSystem, filePath.getParent, user)
+      }
+      fileSystem.createNewFile(filePath)
+      fileSystem.setOwner(filePath, user)
+    }
+  }
+
   /**
    * Recursively create a directory(递归创建目录)
    * @param fileSystem
@@ -91,6 +117,7 @@ object FileSystemUtils extends Logging {
    * @return
    */
   @throws[IOException]
+  @deprecated("please use mkdirsAndSetOwner")
   def mkdirs(fileSystem: FileSystem, dest: FsPath, user: String): Boolean = {
     var parentPath = dest.getParent
     val dirsToMake = new util.Stack[FsPath]()
@@ -113,4 +140,32 @@ object FileSystemUtils extends Logging {
     true
   }
 
+  /**
+   * Recursively create a directory(递归创建目录) 默认添加 Owner 信息
+   * @param fileSystem
+   * @param dest
+   * @param user
+   * @throws
+   * @return
+   */
+  @throws[IOException]
+  def mkdirsAndSetOwner(fileSystem: FileSystem, dest: FsPath, user: String): Boolean = {
+    var parentPath = dest.getParent
+    val dirsToMake = new util.Stack[FsPath]()
+    dirsToMake.push(dest)
+    while (!fileSystem.exists(parentPath)) {
+      dirsToMake.push(parentPath)
+      parentPath = parentPath.getParent
+    }
+    if (!fileSystem.canExecute(parentPath)) {
+      throw new IOException("You have not permission to access path " + dest.getPath)
+    }
+    while (!dirsToMake.empty()) {
+      val path = dirsToMake.pop()
+      fileSystem.mkdir(path)
+      fileSystem.setOwner(path, user)
+    }
+    true
+  }
+
 }
diff --git a/...ce/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/HDFSCacheLogWriter.scala b/...ce/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/HDFSCacheLogWriter.scala
@@ -59,7 +59,12 @@ class HDFSCacheLogWriter(logPath: String, charset: String, sharedCache: Cache, u
 
   private def init(): Unit = {
     fileSystem.init(new util.HashMap[String, String]())
-    FileSystemUtils.createNewFileWithFileSystem(fileSystem, new FsPath(logPath), user, true)
+    FileSystemUtils.createNewFileAndSetOwnerWithFileSystem(
+      fileSystem,
+      new FsPath(logPath),
+      user,
+      true
+    )
   }
 
   @throws[IOException]