[incubator-iotdb] branch cluster_concurrent updated: fix ut bug

[lta]

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

lta pushed a commit to branch cluster_concurrent
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/cluster_concurrent by this 
push:
     new 6b37a8c  fix ut bug
6b37a8c is described below

commit 6b37a8cc995fa8b5d229b91e471d73e013683006
Author: lta <litiana...@163.com>
AuthorDate: Thu Apr 11 15:20:24 2019 +0800

    fix ut bug
---
 .../java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java  | 5 -----
 .../org/apache/iotdb/cluster/concurrent/pool/QPTaskManagerTest.java  | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
index f82d440..ae710e5 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
@@ -55,11 +55,6 @@ public class DataStateMachine extends StateMachineAdapter {
   private static final Logger LOGGER = 
LoggerFactory.getLogger(DataStateMachine.class);
 
   /**
-   * Server instance
-   */
-  private Server server = Server.getInstance();
-
-  /**
    * QP executor to apply task
    */
   private OverflowQPExecutor qpExecutor = new OverflowQPExecutor();
diff --git 
a/cluster/src/test/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManagerTest.java
 
b/cluster/src/test/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManagerTest.java
index dd5e717..bc413e4 100644
--- 
a/cluster/src/test/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManagerTest.java
+++ 
b/cluster/src/test/java/org/apache/iotdb/cluster/concurrent/pool/QPTaskManagerTest.java
@@ -79,9 +79,10 @@ public class QPTaskManagerTest {
       new Thread(changeMark).start();
       qpTaskManager.close(true, blockTimeOut * 3);
     } catch (ProcessorException e) {
-      assert false;
+      e.printStackTrace();
     }
 
+    Thread.sleep(blockTimeOut * 2);
     mark = true;
 
     for (int i = 1; i <= threadCnt + 10; i++) {