modify java client witness

TuGraph-family · Apr 9, 2024 · 059fda2 · 059fda2
1 parent 50db181
commit 059fda2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/rpc-client/pom.xml b/rpc-client/pom.xml
@@ -61,7 +61,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <protocVersion>3.6.0</protocVersion>
+                            <protocVersion>3.11.4</protocVersion>
                             <addSources>none</addSources>
                             <includeStdTypes>true</includeStdTypes>
                             <outputDirectory>src/main/java</outputDirectory>

diff --git a/rpc-client/src/main/java/com/antgroup/tugraph/TuGraphDbRpcClient.java b/rpc-client/src/main/java/com/antgroup/tugraph/TuGraphDbRpcClient.java
@@ -354,10 +354,12 @@ private void refreshClientPool() {
             ClusterInfo clusterInfo = JSON.parseObject(JSON.parseArray(result).get(0).toString(), new TypeReference<ClusterInfo>(){});
             List<RaftState> raftStates = clusterInfo.getClusterInfo();
             raftStates.forEach(x -> {
-                TuGraphSingleRpcClient rpcClient = new TuGraphSingleRpcClient("list://" + x.getRpcAddress(), user, password);
-                rpcClientPool.add(rpcClient);
-                if (x.getState().equals(RaftState.StateConstant.MASTER)) {
-                    leaderClient = rpcClient;
+                if (!Objects.equals(x.getRole(), "WITNESS")) {
+                    TuGraphSingleRpcClient rpcClient = new TuGraphSingleRpcClient("list://" + x.getRpcAddress(), user, password);
+                    rpcClientPool.add(rpcClient);
+                    if (x.getState().equals(RaftState.StateConstant.MASTER)) {
+                        leaderClient = rpcClient;
+                    }
                 }
             });
         } else {

diff --git a/rpc-client/src/main/java/com/antgroup/tugraph/model/RaftState.java b/rpc-client/src/main/java/com/antgroup/tugraph/model/RaftState.java
@@ -16,6 +16,8 @@ public class RaftState {
     private String rpcAddress;
     @JSONField(name = "state")
     private String state;
+    @JSONField(name = "ha_role")
+    private String role;
 
     public static class StateConstant {