fix CI

apache · Jun 27, 2021 · 300169a · 300169a
1 parent dc7b26d
commit 300169a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -1837,7 +1837,7 @@ public void applyRemoveNode(RemoveNodeLog removeNodeLog) {
     }
   }
 
-  private void exileNode(RemoveNodeLog removeNodeLog) {
+  protected void exileNode(RemoveNodeLog removeNodeLog) {
     logger.debug("Exile node {}: start.", removeNodeLog.getRemovedNode());
     Node node = removeNodeLog.getRemovedNode();
     if (config.isUseAsyncServer()) {

diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
@@ -737,13 +737,14 @@ public void testQuerySingleSeries()
     // node1 manages the data above
     dataGroupMember.setThisNode(TestUtils.getNode(10));
     dataGroupMember.setAllNodes(
-        partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), 0)));
+        partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), raftId)));
     dataGroupMember.setCharacter(NodeCharacter.LEADER);
     SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
     request.setPath(TestUtils.getTestSeries(0, 0));
     request.setDataTypeOrdinal(TSDataType.DOUBLE.ordinal());
     request.setRequester(TestUtils.getNode(1));
     request.setQueryId(0);
+    request.setAscending(true);
     Filter filter = TimeFilter.gtEq(5);
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);
@@ -804,13 +805,14 @@ public void testQuerySingleSeriesWithValueFilter()
     // node1 manages the data above
     dataGroupMember.setThisNode(TestUtils.getNode(10));
     dataGroupMember.setAllNodes(
-        partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), 0)));
+        partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), raftId)));
     dataGroupMember.setCharacter(NodeCharacter.LEADER);
     SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
     request.setPath(TestUtils.getTestSeries(0, 0));
     request.setDataTypeOrdinal(TSDataType.DOUBLE.ordinal());
     request.setRequester(TestUtils.getNode(1));
     request.setQueryId(0);
+    request.setAscending(true);
     Filter filter = new AndFilter(TimeFilter.gtEq(5), ValueFilter.ltEq(8.0));
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
     DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);

diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
@@ -150,7 +150,6 @@ public class MetaGroupMemberTest extends BaseMember {
   private DataClusterServer dataClusterServer;
   protected boolean mockDataClusterServer;
   private Node exiledNode;
-  private final Object waitExileNode = new Object();
 
   private int prevReplicaNum;
   private List<String> prevSeedNodes;
@@ -323,6 +322,17 @@ protected MetaGroupMember getMetaGroupMember(Node node) throws QueryProcessExcep
     MetaGroupMember metaGroupMember =
         new MetaGroupMember(new Factory(), node, new Coordinator()) {
 
+          @Override
+          public void applyAddNode(AddNodeLog addNodeLog) {
+            allNodes.add(addNodeLog.getNewNode());
+          }
+
+          @Override
+          public void applyRemoveNode(RemoveNodeLog removeNodeLog) {
+            allNodes.remove(removeNodeLog.getRemovedNode());
+            exileNode(removeNodeLog);
+          }
+
           @Override
           public DataClusterServer getDataClusterServer() {
             return mockDataClusterServer
@@ -486,10 +496,7 @@ public void queryNodeStatus(AsyncMethodCallback<TNodeStatus> resultHandler) {
                 public void exile(
                     ByteBuffer removeNodeLog, AsyncMethodCallback<Void> resultHandler) {
                   System.out.printf("%s was exiled%n", node);
-                  synchronized (waitExileNode) {
-                    exiledNode = node;
-                    waitExileNode.notifyAll();
-                  }
+                  exiledNode = node;
                 }
 
                 @Override
@@ -1314,14 +1321,7 @@ public void testRemoveNodeAsLeader() {
     assertEquals(Response.RESPONSE_AGREE, (long) resultRef.get());
     assertFalse(testMetaMember.getAllNodes().contains(TestUtils.getNode(20)));
     System.out.println("Checking exiled node in testRemoveNodeAsLeader()");
-    synchronized (waitExileNode) {
-      try {
-        waitExileNode.wait();
-      } catch (InterruptedException e) {
-        // ignore
-      }
-      assertEquals(TestUtils.getNode(20), exiledNode);
-    }
+    assertEquals(TestUtils.getNode(20), exiledNode);
   }
 
   @Test