chore(pd-store): minor improvement (#2443)

Author: VGalaxies

hugegraph-pd/hg-pd-test/src/main/java/org/apache/hugegraph/pd/client/PDPulseTest.java

@@ -24,6 +24,7 @@
 import org.apache.hugegraph.pd.grpc.pulse.PartitionHeartbeatRequest;
 import org.apache.hugegraph.pd.pulse.PulseServerNotice;
 import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class PDPulseTest {
     private static PDClient pdClient;
@@ -40,7 +41,7 @@ public static void beforeClass() throws Exception {
         pdClient.getLeader();
     }
 
-    // @Test
+    @Test
     public void listen() {
 
         PDPulse pulse = new PDPulseImpl(pdClient.getLeaderIp());
@@ -106,4 +107,4 @@ public void onCompleted() {
             HgPDTestUtil.println(this.listenerName + " is completed");
         }
     }
-}
+}

hugegraph-pd/pom.xml

@@ -135,7 +135,7 @@
                                 <include>*.tar.gz</include>
                                 <include>.flattened-pom.xml</include>
                                 <!-- WARN: delete dist dir may influence dev? -->
-                                <!-- <include>dist/**</include>-->
+                                <include>dist/**</include>
                             </includes>
                             <followSymlinks>false</followSymlinks>
                         </fileset>

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/StandardHugeGraph.java

@@ -18,7 +18,6 @@
 package org.apache.hugegraph;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -179,8 +178,6 @@ public class StandardHugeGraph implements HugeGraph {
 
     private final RamTable ramtable;
 
-    private final MetaManager metaManager = MetaManager.instance();
-
     private final String schedulerType;
 
     public StandardHugeGraph(HugeConfig config) {
@@ -230,7 +227,10 @@ public StandardHugeGraph(HugeConfig config) {
         }
 
         if (isHstore()) {
-            initMetaManager();
+            // TODO: parameterize the remaining configurations
+            MetaManager.instance().connect("hg", MetaManager.MetaDriverType.PD,
+                                           "ca", "ca", "ca",
+                                           config.get(CoreOptions.PD_PEERS));
         }
 
         try {
@@ -470,12 +470,6 @@ private boolean isHstore() {
         return this.storeProvider.isHstore();
     }
 
-    private void initMetaManager() {
-        this.metaManager.connect("hg", MetaManager.MetaDriverType.PD,
-                                 "ca", "ca", "ca",
-                                 Collections.singletonList("127.0.0.1:8686"));
-    }
-
     private ISchemaTransaction openSchemaTransaction() throws HugeException {
         this.checkGraphNotClosed();
         try {

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/config/CoreOptions.java

@@ -674,4 +674,11 @@ public static synchronized CoreOptions instance() {
                     CollectionType::valueOf,
                     "EC"
             );
+
+    public static final ConfigOption<String> PD_PEERS = new ConfigOption<>(
+        "pd.peers",
+        "The addresses of pd nodes, separated with commas.",
+        disallowEmpty(),
+        "127.0.0.1:8686"
+    );
 }

hugegraph-server/hugegraph-dist/src/assembly/static/conf/graphs/hugegraph.properties

@@ -24,6 +24,16 @@ serializer=binary
 
 store=hugegraph
 
+# pd config
+pd.peers=127.0.0.1:8686
+
+# task config
+task.scheduler_type=local
+task.schedule_period=10
+task.retry=0
+task.wait_timeout=10
+
+# raft config
 raft.mode=false
 raft.path=./raft-log
 raft.safe_read=true
@@ -45,6 +55,7 @@ raft.rpc_connect_timeout=5000
 raft.rpc_timeout=60
 raft.install_snapshot_rpc_timeout=36000
 
+# search config
 search.text_analyzer=jieba
 search.text_analyzer_mode=INDEX