[iotdb] branch rel/0.12 updated: fix cluster groupby memory leak (#4583)

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 7f466f7  fix cluster groupby memory leak (#4583)
7f466f7 is described below

commit 7f466f795bacd2f9430bed2f4ac350ac4671f5dc
Author: Potato <txypot...@gmail.com>
AuthorDate: Thu Dec 16 09:22:46 2021 +0800

    fix cluster groupby memory leak (#4583)
---
 .../org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
index aeb70df..a164974 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
@@ -853,8 +853,6 @@ public class ClusterReaderFactory {
         }
 
         if (executorId != -1) {
-          // record the queried node to release resources later
-          ((RemoteQueryContext) context).registerRemoteNode(node, 
partitionGroup.getHeader());
           logger.debug(
               "{}: get an executorId {} for {}@{} from {}",
               metaGroupMember.getName(),
@@ -883,6 +881,9 @@ public class ClusterReaderFactory {
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
         logger.error("{}: Cannot query {} from {}", metaGroupMember.getName(), 
path, node, e);
+      } finally {
+        // record the queried node to release resources later
+        ((RemoteQueryContext) context).registerRemoteNode(node, 
partitionGroup.getHeader());
       }
     }
     throw new StorageEngineException(