You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/06/12 03:15:12 UTC

[iotdb] branch master updated: Try fix Concurrent Bug (#6214)

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

jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 28a2bab330 Try fix Concurrent Bug (#6214)
28a2bab330 is described below

commit 28a2bab3308577c2399ed6d879f7c65322790b1e
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Sun Jun 12 11:15:06 2022 +0800

    Try fix Concurrent Bug (#6214)
---
 .../db/mpp/execution/datatransfer/SharedTsBlockQueue.java      |  4 ++--
 .../iotdb/db/mpp/execution/datatransfer/SourceHandle.java      |  2 +-
 .../org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java |  1 +
 .../iotdb/db/mpp/plan/execution/memory/MemorySourceHandle.java |  4 ++--
 .../db/mpp/plan/planner/distribution/DistributionPlanner.java  |  2 +-
 .../iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java   | 10 ++++------
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SharedTsBlockQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SharedTsBlockQueue.java
index 10e07fe439..e81f3dcbc5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SharedTsBlockQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SharedTsBlockQueue.java
@@ -63,7 +63,7 @@ public class SharedTsBlockQueue {
         Validate.notNull(localMemoryManager, "local memory manager cannot be null");
   }
 
-  public boolean hasNoMoreTsBlocks() {
+  public synchronized boolean hasNoMoreTsBlocks() {
     return noMoreTsBlocks;
   }
 
@@ -75,7 +75,7 @@ public class SharedTsBlockQueue {
     return blocked;
   }
 
-  public boolean isEmpty() {
+  public synchronized boolean isEmpty() {
     return queue.isEmpty();
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SourceHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SourceHandle.java
index a3db461639..60d1c9c85e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SourceHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/datatransfer/SourceHandle.java
@@ -253,7 +253,7 @@ public class SourceHandle implements ISourceHandle {
   // Return true indicates two points:
   //   1. Remote SinkHandle has told SourceHandle the total count of TsBlocks by lastSequenceId
   //   2. All the TsBlocks has been consumed up
-  private boolean remoteTsBlockedConsumedUp() {
+  private synchronized boolean remoteTsBlockedConsumedUp() {
     return currSequenceId - 1 == lastSequenceId;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 417a2f9040..49e7d9ef9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -145,6 +145,7 @@ public class QueryExecution implements IQueryExecution {
             if (state == QueryState.FAILED
                 || state == QueryState.ABORTED
                 || state == QueryState.CANCELED) {
+              logger.info("release resource because Query State is: {}", state);
               releaseResource();
             }
           }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/memory/MemorySourceHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/memory/MemorySourceHandle.java
index fcd57059c5..ecd0953f17 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/memory/MemorySourceHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/memory/MemorySourceHandle.java
@@ -55,13 +55,13 @@ public class MemorySourceHandle implements ISourceHandle {
   }
 
   @Override
-  public TsBlock receive() {
+  public synchronized TsBlock receive() {
     hasNext = false;
     return result;
   }
 
   @Override
-  public boolean isFinished() {
+  public synchronized boolean isFinished() {
     return !hasNext;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
index 3be4a6daf6..421de275da 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/DistributionPlanner.java
@@ -125,7 +125,7 @@ public class DistributionPlanner {
   }
 
   private PlanFragmentId getNextFragmentId() {
-    return new PlanFragmentId(this.logicalPlan.getContext().getQueryId(), this.planFragmentIndex++);
+    return this.logicalPlan.getContext().getQueryId().genPlanFragmentId();
   }
 
   private class FragmentBuilder {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
index 7f594de216..fc3bc9a303 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
@@ -27,7 +27,6 @@ import org.apache.iotdb.db.auth.AuthorizerManager;
 import org.apache.iotdb.db.conf.IoTDBConfig;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.conf.OperationType;
-import org.apache.iotdb.db.mpp.common.QueryId;
 import org.apache.iotdb.db.mpp.common.header.DatasetHeader;
 import org.apache.iotdb.db.mpp.plan.Coordinator;
 import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
@@ -1299,11 +1298,10 @@ public class DataNodeTSIServiceImpl implements TSIEventHandler {
   private void cleanupQueryExecution(Long queryId) {
     IQueryExecution queryExecution = COORDINATOR.getQueryExecution(queryId);
     if (queryExecution != null) {
-      queryExecution.stopAndCleanup();
+      try (SetThreadName threadName = new SetThreadName(queryExecution.getQueryId())) {
+        LOGGER.info("stop and clean up");
+        queryExecution.stopAndCleanup();
+      }
     }
   }
-
-  private QueryId genQueryId(long id) {
-    return new QueryId(String.valueOf(id));
-  }
 }