[iotdb] branch ca_test updated: pick last node to remove

[tanxinyu]

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

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


The following commit(s) were added to refs/heads/ca_test by this push:
     new 3db15a82d27 pick last node to remove
3db15a82d27 is described below

commit 3db15a82d27d9f7b37b8faa1b27129f0f7c6e447
Author: OneSizeFitQuorum <tanxi...@apache.org>
AuthorDate: Wed Aug 16 18:44:15 2023 +0800

    pick last node to remove
    
    Signed-off-by: OneSizeFitQuorum <tanxi...@apache.org>
---
 .../apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
index d4cde051a84..26ca8f1a496 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
@@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -58,6 +59,7 @@ import static 
org.apache.iotdb.consensus.ConsensusFactory.IOT_CONSENSUS;
 import static org.apache.iotdb.consensus.ConsensusFactory.SIMPLE_CONSENSUS;
 
 public class DataNodeRemoveHandler {
+
   private static final Logger LOGGER = 
LoggerFactory.getLogger(DataNodeRemoveHandler.class);
 
   private static final ConfigNodeConfig CONF = 
ConfigNodeDescriptor.getInstance().getConf();
@@ -405,7 +407,7 @@ public class DataNodeRemoveHandler {
     return 
configManager.getNodeManager().filterDataNodeThroughStatus(NodeStatus.Running).stream()
         .map(TDataNodeConfiguration::getLocation)
         .filter(e -> !regionReplicaNodes.contains(e))
-        .findAny();
+        .max(Comparator.comparingInt(TDataNodeLocation::getDataNodeId));
   }
 
   private boolean isSucceed(TSStatus status) {