bdware/agent-backend
2
0
Fork 0
mirror of https://gitee.com/BDWare/agent-backend synced 2025-01-10 01:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: update SelfAdaptiveShardingExecutor

Browse Source 
update SelfAdaptiveShardingExecutor.submitBlock to avoid creating too many threads; add logs
This commit is contained in:
Frank.R.Wu 2021-11-19 14:51:25 +08:00
parent 969e456687
commit 9fb5cd6eb4
4 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/main/java/org/bdware/server/action/CMActions.java
View File

@ -120,15 +120,17 @@ public class CMActions implements OnHashCallback {
final JsonObject args, final JsonObject args,
final ResultCallback resultCallback, final ResultCallback resultCallback,
final OnHashCallback hashcb) { final OnHashCallback hashcb) {
final ContractRequest c = new ContractRequest(); final ContractRequest cReq = new ContractRequest();
if (!args.has("contractName") && !args.has("contractID") && !args.has("contractDOI")) { if (!args.has("contractName") &&
!args.has("contractID") &&
!args.has("contractDOI")) {
resultCallback.onResult(MISSING_ARGUMENT); resultCallback.onResult(MISSING_ARGUMENT);
return; return;
} }
if (args.has("contractDOI") && !args.has("contractID")) { if (args.has("contractDOI") && !args.has("contractID")) {
LOGGER.debug("contractDOI: " + args.get("contractDOI").getAsString()); LOGGER.debug("contractDOI: " + args.get("contractDOI").getAsString());
try { try {
c.setContractDOI(args.get("contractDOI").getAsString()); cReq.setContractDOI(args.get("contractDOI").getAsString());
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
resultCallback.onResult(INVALID_DOI); resultCallback.onResult(INVALID_DOI);
@ -136,86 +138,91 @@ public class CMActions implements OnHashCallback {
} }
} else { } else {
if (args.has("contractName")) { if (args.has("contractName")) {
c.setContractID(args.get("contractName").getAsString()); cReq.setContractID(args.get("contractName").getAsString());
} }
if (args.has("contractID")) { if (args.has("contractID")) {
c.setContractID(args.get("contractID").getAsString()); cReq.setContractID(args.get("contractID").getAsString());
} }
} }
if (args.has("isDebug")) c.setFromDebug(args.get("isDebug").getAsBoolean()); if (args.has("isDebug")) {
cReq.setFromDebug(args.get("isDebug").getAsBoolean());
}
if (args.has("withDynamicAnalysis")) if (args.has("withDynamicAnalysis"))
c.withDynamicAnalysis = args.get("withDynamicAnalysis").getAsBoolean(); cReq.withDynamicAnalysis = args.get("withDynamicAnalysis").getAsBoolean();
if (args.has("withEvaluatesAnalysis")) if (args.has("withEvaluatesAnalysis"))
c.withEvaluatesAnalysis = args.get("withEvaluatesAnalysis").getAsBoolean(); cReq.withEvaluatesAnalysis = args.get("withEvaluatesAnalysis").getAsBoolean();
if (!args.has("arg")) { if (!args.has("arg")) {
resultCallback.onResult(MISSING_ARGUMENT); resultCallback.onResult(MISSING_ARGUMENT);
return; return;
} }
if (args.has("operation")) { if (args.has("operation")) {
c.setAction(args.get("operation").getAsString()); cReq.setAction(args.get("operation").getAsString());
c.setArg(args.get("arg").getAsString()); cReq.setArg(args.get("arg").getAsString());
} else { } else {
JsonObject jo = JsonParser.parseString(args.get("arg").getAsString()).getAsJsonObject(); JsonObject jo = JsonParser.parseString(args.get("arg").getAsString()).getAsJsonObject();
if (!jo.has("action") || !jo.has("arg")) { if (!jo.has("action") || !jo.has("arg")) {
resultCallback.onResult(MISSING_ARGUMENT); resultCallback.onResult(MISSING_ARGUMENT);
return; return;
} }
c.setAction(jo.get("action").getAsString()); cReq.setAction(jo.get("action").getAsString());
c.setArg(jo.get("arg").getAsString()); cReq.setArg(jo.get("arg").getAsString());
if (c.withEvaluatesAnalysis) { if (cReq.withEvaluatesAnalysis) {
c.setValue(jo.get("hasValue").getAsLong()); cReq.setValue(jo.get("hasValue").getAsLong());
} }
} }
if (args.has("gasLimit")) c.setGasLimit(args.get("gasLimit").getAsLong()); if (args.has("gasLimit")) {
cReq.setGasLimit(args.get("gasLimit").getAsLong());
}
if (args.has("requester")) { if (args.has("requester")) {
c.setPublicKey(args.get("requester").getAsString()); cReq.setPublicKey(args.get("requester").getAsString());
byte[] sign = ByteUtils.fromHexString(args.get("signature").getAsString()); byte[] sign = ByteUtils.fromHexString(args.get("signature").getAsString());
c.setSignature(ByteUtils.toHexString(sign)); cReq.setSignature(ByteUtils.toHexString(sign));
} }
if (args.has("requesterDOI")) { if (args.has("requesterDOI")) {
c.setRequesterDOI(args.get("requesterDOI").getAsString()); cReq.setRequesterDOI(args.get("requesterDOI").getAsString());
} else { } else {
c.setRequesterDOI("empty"); cReq.setRequesterDOI("empty");
} }
if (args.has("pubkey")) { if (args.has("pubkey")) {
c.setPublicKey(args.get("pubkey").getAsString()); cReq.setPublicKey(args.get("pubkey").getAsString());
byte[] sign = ByteUtils.fromHexString(args.get("signature").getAsString()); byte[] sign = ByteUtils.fromHexString(args.get("signature").getAsString());
c.setSignature(ByteUtils.toHexString(sign)); cReq.setSignature(ByteUtils.toHexString(sign));
} }
if (c.getPublicKey() != null) { if (cReq.getPublicKey() != null) {
if (!c.verifySignature()) { if (!cReq.verifySignature()) {
c.setPublicKey(null); cReq.setPublicKey(null);
c.setRequester(null); cReq.setRequester(null);
} }
} }
String reqID; String reqID;
if (args.has("requestID")) reqID = args.get("requestID").getAsString(); if (args.has("requestID")) {
else { reqID = args.get("requestID").getAsString();
} else {
reqID = System.currentTimeMillis() + "_" + (int) (Math.random() * 1000); reqID = System.currentTimeMillis() + "_" + (int) (Math.random() * 1000);
args.addProperty("requestID", reqID); args.addProperty("requestID", reqID);
} }
c.setRequestID(reqID); cReq.setRequestID(reqID);
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
manager.executeContractInternal( manager.executeContractInternal(
c, cReq,
new ResultCallback() { new ResultCallback() {
@Override @Override
public void onResult(JsonObject ret) { public void onResult(JsonObject ret) {
ret.addProperty("responseID", c.getRequestID()); ret.addProperty("responseID", cReq.getRequestID());
ret.addProperty("action", "onExecuteResult"); ret.addProperty("action", "onExecuteResult");
String costTime = (System.currentTimeMillis() - start) + ""; String costTime = (System.currentTimeMillis() - start) + "";
ret.addProperty("executeTime", costTime); ret.addProperty("executeTime", costTime);
ContractMeta meta = ContractMeta meta =
manager.statusRecorder.getContractMeta(c.getContractID()); manager.statusRecorder.getContractMeta(cReq.getContractID());
if (meta != null && meta.getIsDebug()) { if (meta != null && meta.getIsDebug()) {
FUNCINVOKEINFO.putOneInvoke( FUNCINVOKEINFO.putOneInvoke(
c.getContractID(), cReq.getContractID(),
c.getAction(), cReq.getAction(),
c.getRequestID(), cReq.getRequestID(),
c.getArg(), cReq.getArg(),
ret.has("result") ? ret.get("result").toString() : ""); ret.has("result") ? ret.get("result").toString() : "");
} }
LOGGER.debug("result of request " + cReq.getRequestID() + ": " + ret);
resultCallback.onResult(ret.toString()); resultCallback.onResult(ret.toString());
} }

2
src/main/java/org/bdware/server/action/MasterWSAction.java
View File

@ -303,7 +303,7 @@ public class MasterWSAction {
+ contract.getID() + contract.getID()
+ "\"," + "\","
+ "\"action\":\"onStartTrustfulContract\"}"); + "\"action\":\"onStartTrustfulContract\"}");
LOGGER.info("success!"); LOGGER.info("startContractMultiPoint succeed!");
} }
} }

10
src/main/java/org/bdware/server/action/p2p/MasterClientTCPAction.java
View File

@ -193,13 +193,13 @@ public class MasterClientTCPAction {
Contract contract = JsonUtil.fromJson(jo.get("contractStr").getAsString(), Contract.class); Contract contract = JsonUtil.fromJson(jo.get("contractStr").getAsString(), Contract.class);
String contractID = contract.getID(); String contractID = contract.getID();
// 获取contract type // 获取contract type
LOGGER.info(contract.getType()); LOGGER.debug(contract.getType());
if (contract.getType() == ContractExecType.Sharding) { if (contract.getType() == ContractExecType.Sharding) {
// 每节点都是master，且MPCI中需要实例化出MultiPointCooperationExecutor， // 每节点都是master，且MPCI中需要实例化出MultiPointCooperationExecutor，
// 需要计算出自己的ShardingID？路由规则（id/requester/arg-->shardingId)， // 需要计算出自己的ShardingID？路由规则（id/requester/arg-->shardingId)，
// 也在MultiPointCooperationExecutor中实现 // 也在MultiPointCooperationExecutor中实现
} }
//TOODO master连接 //TODO master连接
// contractID2MasterInfo.put(contractID, this); // 记录contractID 和 master之间的对应关系 // contractID2MasterInfo.put(contractID, this); // 记录contractID 和 master之间的对应关系
MultiContractMeta cei = MultiContractMeta cei =
CMActions.manager.multiContractRecorder.createIfNotExist(contractID); CMActions.manager.multiContractRecorder.createIfNotExist(contractID);
@ -252,12 +252,10 @@ public class MasterClientTCPAction {
cei.setIsMaster(true); cei.setIsMaster(true);
} }
LOGGER.info("启动参数： " + JsonUtil.toJson(contract)); LOGGER.debug("startup arguments: " + JsonUtil.toJson(contract));
String ret = CMActions.manager.startContract(contract); // 调用CMActions 里的启动合约的方法,启动结果 String ret = CMActions.manager.startContract(contract); // 调用CMActions 里的启动合约的方法,启动结果
LOGGER.info("启动结果为 " + ret); LOGGER.debug("startup result: " + ret);
CMActions.manager.multiContractRecorder.updateValue(cei); CMActions.manager.multiContractRecorder.updateValue(cei);
ContractMeta meta = CMActions.manager.statusRecorder.createIfNotExist(contractID); ContractMeta meta = CMActions.manager.statusRecorder.createIfNotExist(contractID);

55
src/main/java/org/bdware/server/trustedmodel/SelfAdaptiveShardingExecutor.java
View File

@ -17,10 +17,7 @@ import org.bdware.server.action.p2p.MasterServerRecoverMechAction;
import org.bdware.units.NetworkManager; import org.bdware.units.NetworkManager;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.*;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -47,7 +44,10 @@ public class SelfAdaptiveShardingExecutor implements ContractExecutor {
2, 2,
2, 2,
TimeUnit.SECONDS); TimeUnit.SECONDS);
ContractManager.threadPool.submit(() -> { LOGGER.debug(String.format("ContractManager.threadPool=%d/%d",
((ThreadPoolExecutor) ContractManager.threadPool).getActiveCount(),
((ThreadPoolExecutor) ContractManager.threadPool).getPoolSize()));
ContractManager.threadPool.execute(() -> {
LOGGER.info( LOGGER.info(
"[SelfAdaptiveShardingExecutor " + meta.getContractID() + "] starting service..." + running); "[SelfAdaptiveShardingExecutor " + meta.getContractID() + "] starting service..." + running);
while (running) { while (running) {
@ -91,10 +91,16 @@ public class SelfAdaptiveShardingExecutor implements ContractExecutor {
ContractResult.Status.Executing, ContractResult.Status.Executing,
new JsonPrimitive("this request is adding into blocks")))); new JsonPrimitive("this request is adding into blocks"))));
if (reqQueue.size() >= SUBMIT_LIMIT) { if (reqQueue.size() >= SUBMIT_LIMIT) {
submitBlock(); ContractManager.threadPool.execute(this::submitBlock);
} }
} }
@Override
public void close() {
this.future.cancel(false);
this.running = false;
LOGGER.info("destruct executor of contract " + meta.getContractID());
}
public void execute(String blockStr) { public void execute(String blockStr) {
Block block = JsonUtil.fromJson(blockStr, Block.class); Block block = JsonUtil.fromJson(blockStr, Block.class);
@ -128,7 +134,11 @@ public class SelfAdaptiveShardingExecutor implements ContractExecutor {
// TODO check status // TODO check status
for (ContractRequest request : block.requests) { for (ContractRequest request : block.requests) {
String ret = ContractManager.instance.executeLocally(request, null); String ret = ContractManager.instance.executeLocally(request, null);
LOGGER.debug("result of request " + request.getRequestID() + ": " + ret); LOGGER.debug(String.format(
"[SelfAdaptiveShardingExecutor %s] result of request %s: %s",
meta.getContractID(),
request.getRequestID(),
ret));
executedTxs.put(request.getRequestID(), true); executedTxs.put(request.getRequestID(), true);
} }
LOGGER.info(String.format( LOGGER.info(String.format(
@ -142,24 +152,23 @@ public class SelfAdaptiveShardingExecutor implements ContractExecutor {
} }
private void submitBlock() { private void submitBlock() {
ContractManager.threadPool.execute(() -> { Block block = fillBlock();
Block block = fillBlock(); if (null != block) {
if (null != block) { LOGGER.info("deliver block " + block.hash + "...");
LOGGER.debug(JsonUtil.toPrettyJson(block)); LOGGER.debug(JsonUtil.toPrettyJson(block));
String[] nodes = this.meta.getMembers(); String[] nodes = this.meta.getMembers();
JsonObject req = new JsonObject(); JsonObject req = new JsonObject();
req.addProperty("action", "deliverBlock"); req.addProperty("action", "deliverBlock");
req.addProperty("data", JsonUtil.toJson(block)); req.addProperty("data", JsonUtil.toJson(block));
req.addProperty("contractID", this.meta.getContractID()); req.addProperty("contractID", this.meta.getContractID());
String reqStr = req.toString(); String reqStr = req.toString();
for (String node : nodes) { for (String node : nodes) {
if (MasterServerRecoverMechAction.recoverStatus.get(node).get(this.meta.getContractID()) if (MasterServerRecoverMechAction.recoverStatus.get(node).get(this.meta.getContractID())
== RecoverFlag.Fine) { == RecoverFlag.Fine) {
NetworkManager.instance.sendToAgent(node, reqStr); NetworkManager.instance.sendToAgent(node, reqStr);
}
} }
} }
}); }
} }
private synchronized Block fillBlock() { private synchronized Block fillBlock() {