remove supports for hadoop2

apache · Dec 20, 2024 · 5f6597a · 5f6597a
1 parent 240393c
commit 5f6597a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/...r-yarn/src/main/scala/org/apache/kyuubi/spark/connector/yarn/YarnLogPartitionReader.scala b/...r-yarn/src/main/scala/org/apache/kyuubi/spark/connector/yarn/YarnLogPartitionReader.scala
@@ -56,8 +56,6 @@ class YarnLogPartitionReader(yarnLogPartition: YarnLogPartition)
    * * hadoop3:
    * * /tmp/logs/xxx/bucket-xxx-tfile/0001/application_1734531705578_0001/localhost_32422
    * * /tmp/logs/xxx/bucket-logs-tfile/0001/application_1734530210878_0001/localhost_24232
-   * * hadoop2:
-   * * /tmp/logs/xxx/logs/application_1716268141594_240044/node10_35254
    *
    * @param logStatus
    * @param user

diff --git a/...rk-connector-yarn/src/main/scala/org/apache/kyuubi/spark/connector/yarn/YarnLogScan.scala b/...rk-connector-yarn/src/main/scala/org/apache/kyuubi/spark/connector/yarn/YarnLogScan.scala
@@ -81,8 +81,6 @@ case class YarnLogScan(
    * hadoop3:
    * /tmp/logs/xxx/bucket-xxx-tfile/0001/application_1734531705578_0001/localhost_32422
    * /tmp/logs/xxx/bucket-logs-tfile/0001/application_1734530210878_0001/localhost_24232
-   * hadoop2:
-   * /tmp/logs/xxx/logs/application_1716268141594_240044/node10_35254
    *
    * @return
    */
@@ -91,13 +89,9 @@ case class YarnLogScan(
       case pushed if pushed.isEmpty => listFiles(remoteAppLogDir)
       case pushed => pushed.collectFirst {
           case EqualTo("app_id", appId: String) =>
-            listFiles(s"${remoteAppLogDir}/*/*/*/${appId}") ++
-              // compatible for hadoop2
-              listFiles(s"${remoteAppLogDir}/*/*/${appId}")
+            listFiles(s"${remoteAppLogDir}/*/*/*/${appId}")
           case EqualTo("container_id", containerId: String) =>
-            listFiles(s"${remoteAppLogDir}/*/*/*/*/${containerId}") ++
-              // compatible for hadoop2
-              listFiles(s"${remoteAppLogDir}/*/*/*/${containerId}")
+            listFiles(s"${remoteAppLogDir}/*/*/*/*/${containerId}")
           case EqualTo("user", user: String) => listFiles(s"${remoteAppLogDir}/${user}")
           case _ => listFiles(remoteAppLogDir)
         }.get