[kyuubi] branch branch-1.7 updated: [KYUUBI #5210]Cancel operation will cause the log file node to leak

[ulyssesyou]

This is an automated email from the ASF dual-hosted git repository.

ulyssesyou pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.7 by this push:
     new 00fccc3f6 [KYUUBI #5210]Cancel operation will cause the log file node 
to leak
00fccc3f6 is described below

commit 00fccc3f6f421fe810ea13cb8f32189135346ee6
Author: peiyue liu <945076...@qq.com>
AuthorDate: Thu Sep 14 18:44:18 2023 +0800

    [KYUUBI #5210]Cancel operation will cause the log file node to leak
    
    ### _Why are the changes needed?_
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including 
negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run 
test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests)
 locally before make a pull request
    
    ### _Was this patch authored or co-authored using generative AI tooling?_
    
    Closes #5211 from ASiegeLion/master.
    
    Closes #5210
    
    6366e962d [peiyue liu] Merge branch 'apache:master' into master
    34dcc57dc [liupeiyue] [KYUUBI #5210]Cancel operation will cause the log 
file node to leak
    
    Lead-authored-by: peiyue liu <945076...@qq.com>
    Co-authored-by: liupeiyue <liupei...@yy.com>
    Signed-off-by: ulyssesyou <ulysses...@apache.org>
    (cherry picked from commit 721c0a437cd52a2285041d1856b7fddcdbe6b5c5)
    Signed-off-by: ulyssesyou <ulysses...@apache.org>
---
 .../org/apache/kyuubi/operation/KyuubiOperation.scala      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
 
b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
index 660405bcf..554edc71b 100644
--- 
a/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
+++ 
b/kyuubi-server/src/main/scala/org/apache/kyuubi/operation/KyuubiOperation.scala
@@ -124,13 +124,6 @@ abstract class KyuubiOperation(session: Session) extends 
AbstractOperation(sessi
     if (!isClosedOrCanceled) {
       setState(OperationState.CLOSED)
       MetricsSystem.tracing(_.decCount(MetricRegistry.name(OPERATION_OPEN, 
opType)))
-      try {
-        // For launch engine operation, we use OperationLog to pass engine 
submit log but
-        // at that time we do not have remoteOpHandle
-        getOperationLog.foreach(_.close())
-      } catch {
-        case e: IOException => error(e.getMessage, e)
-      }
       if (_remoteOpHandle != null) {
         try {
           client.closeOperation(_remoteOpHandle)
@@ -140,6 +133,13 @@ abstract class KyuubiOperation(session: Session) extends 
AbstractOperation(sessi
         }
       }
     }
+    try {
+      // For launch engine operation, we use OperationLog to pass engine 
submit log but
+      // at that time we do not have remoteOpHandle
+      getOperationLog.foreach(_.close())
+    } catch {
+      case e: IOException => error(e.getMessage, e)
+    }
   }
 
   override def getResultSetMetadata: TGetResultSetMetadataResp = {