enhancement : add some configuration item description

Signed-off-by: zhuhyc <[email protected]>
shijiesun · Jun 9, 2020 · 2c406af · 2c406af
1 parent eeb7bca
commit 2c406af
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/docs/source/admin-api/master/cluster.rst b/docs/source/admin-api/master/cluster.rst
@@ -60,6 +60,7 @@ Show cluster space information by zone.
 response
 
 .. code-block:: json
+
     {
         "DataNodeStatInfo": {
             "TotalGB": 1,

diff --git a/docs/source/user-guide/master.rst b/docs/source/user-guide/master.rst
@@ -37,6 +37,16 @@ ChubaoFS use **JSON** as configuration file format.
    "exporterPort", "int", "The prometheus exporter port", "No"
    "consulAddr", "string", "The consul register addr for prometheus exporter", "No"
    "metaNodeReservedMem","string","If the metanode memory is below this value, it will be marked as read-only. Unit: byte. 1073741824 by default.", "No"
+   "heartbeatPort","string","Raft heartbeat port,5901 by default","No"
+   "replicaPort","string","Raft replica Port,5902 by default","No"
+   "nodeSetCap","string","the capacity of node set,18 by default","No"
+   "missingDataPartitionInterval","string","how much time it has not received the heartbeat of replica,the replica is considered  missing ,24 hours by default","No"
+   "dataPartitionTimeOutSec","string","how much time it has not received the heartbeat of replica, the replica is considered not alive ,10 minutes by default","No"
+   "numberOfDataPartitionsToLoad","string","the maximum number of partitions to check at a time,40  by default","No"
+   "secondsToFreeDataPartitionAfterLoad","string","the task that release the memory occupied by loading data partition task can be start, only after secondsToFreeDataPartitionAfterLoad seconds
+  ,300 by default","No"
+    "tickInterval","string","the interval of timer which check heartbeat and election timeout,500 ms by default","No"
+    "electionTick","string","how many times the tick timer has reset,the election is timeout,5 by default","No"
 
 
 **Example:**

diff --git a/docs/source/user-guide/metanode.rst b/docs/source/user-guide/metanode.rst
@@ -23,7 +23,7 @@ At lease 3 meta nodes are required in respect to high availability.
    "masterAddr", "string", "Addresses of master server", "Yes"
    "zoneName", "string", "Specified zone. ``default`` by default.", "No"
    "totalMem","string", "Max memory metadata used. The value needs to be higher than the value of *metaNodeReservedMem* in the master configuration. Unit: byte", "Yes"
-
+   "deleteBatchCount","int64","when deleting inodes, how many are deleted at a time ,500 by default","No"
 
 
 

diff --git a/master/config.go b/master/config.go
@@ -31,7 +31,7 @@ const (
 	// if the data partition has not been reported within this interval  (in terms of seconds), it will be considered as missing.
 	missingDataPartitionInterval        = "missingDataPartitionInterval"
 	dataPartitionTimeOutSec             = "dataPartitionTimeOutSec"
-	NumberOfDataPartitionsToLoad        = "NumberOfDataPartitionsToLoad"
+	NumberOfDataPartitionsToLoad        = "numberOfDataPartitionsToLoad"
 	secondsToFreeDataPartitionAfterLoad = "secondsToFreeDataPartitionAfterLoad"
 	nodeSetCapacity                     = "nodeSetCap"
 	cfgMetaNodeReservedMem              = "metaNodeReservedMem"

diff --git a/metanode/metanode.go b/metanode/metanode.go
@@ -166,7 +166,6 @@ func (m *MetaNode) parseConfig(cfg *config.Config) (err error) {
 	m.raftDir = cfg.GetString(cfgRaftDir)
 	m.raftHeartbeatPort = cfg.GetString(cfgRaftHeartbeatPort)
 	m.raftReplicatePort = cfg.GetString(cfgRaftReplicaPort)
-	m.raftReplicatePort = cfg.GetString(cfgRaftReplicaPort)
 	m.zoneName = cfg.GetString(cfgZoneName)
 	configTotalMem, _ = strconv.ParseUint(cfg.GetString(cfgTotalMem), 10, 64)