This is an automated email from the ASF dual-hosted git repository. vgalaxies pushed a commit to branch fix-pd-test in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 66122a6a0c92266173776693525af534face8ce8 Author: VGalaxies <[email protected]> AuthorDate: Sat Mar 16 12:16:02 2024 +0800 fix NPE --- .../src/main/java/org/apache/hugegraph/pd/ConfigService.java | 7 ++++++- .../src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java index 2557745c8..4a05b57ee 100644 --- a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java +++ b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/ConfigService.java @@ -18,6 +18,7 @@ package org.apache.hugegraph.pd; import java.util.List; +import java.util.Objects; import org.apache.hugegraph.pd.common.PDException; import org.apache.hugegraph.pd.config.PDConfig; @@ -128,7 +129,11 @@ public class ConfigService implements RaftStateListener { * @throws PDException when io error */ public int getPartitionCount() throws PDException { - return getPDConfig().getPartitionCount(); + Metapb.PDConfig config = getPDConfig(); + if (Objects.nonNull(config)) { + return config.getPartitionCount(); + } + return pdConfig.getInitialPartitionCount(); } @Override diff --git a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java index f3089ed07..6882585a0 100644 --- a/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java +++ b/hugegraph-pd/hg-pd-core/src/main/java/org/apache/hugegraph/pd/raft/RaftEngine.java @@ -159,6 +159,9 @@ public class RaftEngine { } public boolean isLeader() { + if (Objects.isNull(this.raftNode)) { + return false; + } return this.raftNode.isLeader(true); }
