Browse Source

修改BFTSMART服务节点关联网卡启动异常的问题

tags/1.0.1
shaozhuguang 6 years ago
parent
commit
6f13f26917
1 changed files with 7 additions and 9 deletions
  1. +7
    -9
      source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java

+ 7
- 9
source/consensus/consensus-bftsmart/src/main/java/com/jd/blockchain/consensus/bftsmart/service/BftsmartNodeServer.java View File

@@ -6,6 +6,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import bftsmart.tom.*; import bftsmart.tom.*;
import com.jd.blockchain.utils.serialize.binary.BinarySerializeUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.jd.blockchain.consensus.ConsensusManageService; import com.jd.blockchain.consensus.ConsensusManageService;
@@ -49,12 +50,12 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer


private BftsmartConsensusManageService manageService; private BftsmartConsensusManageService manageService;



private volatile BftsmartTopology topology; private volatile BftsmartTopology topology;


private volatile BftsmartConsensusSettings setting; private volatile BftsmartConsensusSettings setting;


private TOMConfiguration tomConfig; private TOMConfiguration tomConfig;
private TOMConfiguration outerTomConfig;


private HostsConfig hostsConfig; private HostsConfig hostsConfig;
private Properties systemConfig; private Properties systemConfig;
@@ -123,14 +124,11 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer
return; return;
} }


protected void initConfig(int id, String systemConfig, String hostsConfig) {

this.tomConfig = new TOMConfiguration(id, systemConfig, hostsConfig);

}

protected void initConfig(int id, Properties systemsConfig, HostsConfig hostConfig) { protected void initConfig(int id, Properties systemsConfig, HostsConfig hostConfig) {
byte[] serialHostConf = BinarySerializeUtils.serialize(hostConfig);
Properties sysConfClone = (Properties)systemsConfig.clone();
this.tomConfig = new TOMConfiguration(id, systemsConfig, hostConfig); this.tomConfig = new TOMConfiguration(id, systemsConfig, hostConfig);
this.outerTomConfig = new TOMConfiguration(id, sysConfClone, BinarySerializeUtils.deserialize(serialHostConf));
} }


@Override @Override
@@ -149,7 +147,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer
} }


public TOMConfiguration getTomConfig() { public TOMConfiguration getTomConfig() {
return tomConfig;
return outerTomConfig;
} }


public int getId() { public int getId() {
@@ -161,7 +159,7 @@ public class BftsmartNodeServer extends DefaultRecoverable implements NodeServer
throw new IllegalArgumentException("ReplicaID is negative!"); throw new IllegalArgumentException("ReplicaID is negative!");
} }
this.tomConfig.setProcessId(id); this.tomConfig.setProcessId(id);
this.outerTomConfig.setProcessId(id);
} }


public BftsmartConsensusSettings getConsensusSetting() { public BftsmartConsensusSettings getConsensusSetting() {


Loading…
Cancel
Save