diff --git a/deploy/deploy-peer/src/main/resources/config/init/ledger.init b/deploy/deploy-peer/src/main/resources/config/init/ledger.init index 2028713a..2e6c2011 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/ledger.init +++ b/deploy/deploy-peer/src/main/resources/config/init/ledger.init @@ -57,11 +57,20 @@ ledger.data.structure=MERKLE_TREE #----------------------------------------------- #共识服务提供者;必须; -consensus.service-provider=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider - +#consensus.service-provider #共识服务的参数配置;推荐使用绝对路径;必须; +#consensus.conf + +# BFT共识配置 +consensus.service-provider=com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider consensus.conf=bftsmart.config +# RAFT共识配置 +#consensus.service-provider=com.jd.blockchain.consensus.raft.RaftConsensusProvider +#consensus.conf=raft.config + +#------------------------------------------------ + #密码服务提供者列表,以英文逗点“,”分隔;必须; crypto.service-providers=com.jd.blockchain.crypto.service.classic.ClassicCryptoService, \ com.jd.blockchain.crypto.service.sm.SMCryptoService diff --git a/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config index 445b723a..fbf592ec 100644 --- a/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config +++ b/deploy/deploy-peer/src/main/resources/config/init/raft/raft.config @@ -18,20 +18,25 @@ system.server.3.network.port=16030 system.server.3.network.secure=false system.server.3.raft.path=/Users/zhangshuang3/Desktop/4nodesTestnet-develop/3 -system.server.election.timeout=1000 -system.server.snapshot.interval=3600 +system.server.block.max.num=100 +system.server.block.max.bytes=4194304 -system.server.rpc.connect.timeout=1000 -system.server.rpc.default.timeout=5000 -system.server.rpc.snapshot.timeout=30000 -system.server.rpc.request.timeout=1000 +system.server.election.timeout=5000 +system.server.snapshot.interval=1800 + +system.client.configuration.refresh.interval=60000 + +system.server.rpc.connect.timeout=10000 +system.server.rpc.default.timeout=10000 +system.server.rpc.snapshot.timeout=300000 +system.server.rpc.request.timeout=20000 system.raft.maxByteCountPerRpc=131072 system.raft.maxEntriesSize=1024 system.raft.maxBodySize=524288 system.raft.maxAppendBufferSize=262144 system.raft.maxElectionDelayMs=1000 -system.raft.electionHeartbeatFactor=10 +system.raft.electionHeartbeatFactor=5 system.raft.applyBatch=32 system.raft.sync=true system.raft.syncMeta=false diff --git a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml index d519bee0..6d5b45be 100644 --- a/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml +++ b/deploy/deploy-peer/src/main/resources/config/log4j2-peer.xml @@ -29,6 +29,8 @@ + +