Skip to content

use groupInfo when updateBlockNotify only if it's not null #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2020
Merged

use groupInfo when updateBlockNotify only if it's not null #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sdk-amop/src/main/java/org/fisco/bcos/sdk/amop/topic/TopicManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ public Set<String> getTopicNames() {
}

public void updateBlockNotify(String peerIpPort, List<String> groupInfo) {
if (groupInfo == null) {
return;
}
logger.debug(
"update block notify, peer: {}, groupInfo: {}", peerIpPort, groupInfo.toString());
Set<String> pnf = new HashSet<>();
Expand Down
6 changes: 4 additions & 2 deletions sdk-core/src/main/java/org/fisco/bcos/sdk/channel/ChannelImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,13 @@ public void run(Timeout timeout) {
logger.warn("send message with seq {} to {} failed ", out.getSeq(), peerIpPort);
Response response = new Response();
response.setErrorCode(ChannelMessageError.CONNECTION_INVALID.getError());
response.setErrorMessage(
String errorContent =
"Send message "
+ peerIpPort
+ " failed for connect failed, current available peers: "
+ getAvailablePeer().toString());
+ getAvailablePeer().toString();
response.setErrorMessage(errorContent);
response.setContent(errorContent);
response.setMessageID(out.getSeq());
if (callback != null) {
callback.onResponse(response);
Expand Down
4 changes: 3 additions & 1 deletion sdk-core/src/main/java/org/fisco/bcos/sdk/network/ConnectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public void startConnect(ConfigOption configOption) throws NetworkException {
/** try connection */
List<ChannelFuture> connChannelFuture = new ArrayList<ChannelFuture>();
for (ConnectionInfo connect : connectionInfoList) {
logger.debug("startConnect to {}", connect.getEndPoint());
ChannelFuture channelFuture = bootstrap.connect(connect.getIp(), connect.getPort());
connChannelFuture.add(channelFuture);
}
Expand Down Expand Up @@ -175,7 +176,7 @@ private void reconnect() {
bootstrap.connect(connectionInfo.getIp(), connectionInfo.getPort());
List<RetCode> errorMessageList = new ArrayList<>();
if (checkConnectionResult(connectionInfo, connectFuture, errorMessageList)) {
logger.trace(
logger.info(
" reconnect to {}:{} success",
connectionInfo.getIp(),
connectionInfo.getPort());
Expand Down Expand Up @@ -404,6 +405,7 @@ private boolean checkConnectionResult(
protected ChannelHandlerContext addConnectionContext(
String ip, int port, ChannelHandlerContext ctx) {
String endpoint = ip + ":" + port;
logger.debug("addConnectionContext, endpoint: {}, ctx:{}", endpoint, ctx);
return availableConnections.put(endpoint, ctx);
}

Expand Down
2 changes: 1 addition & 1 deletion sdk-service/src/main/java/org/fisco/bcos/sdk/client/JsonRpcService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ protected <T extends JsonRpcResponse> T parseResponseIntoJsonRpcResponse(

} catch (JsonProcessingException e) {
logger.error(
"parseResponseIntoJsonRpcResponse failed for decode the message exceptioned, errorMessge: {}, groupId: {}",
"parseResponseIntoJsonRpcResponse failed for decode the message exception, errorMessage: {}, groupId: {}",
e.getMessage(),
this.groupId);
throw new ClientException(
Expand Down
35 changes: 28 additions & 7 deletions sdk-service/src/main/java/org/fisco/bcos/sdk/service/GroupManagerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,15 @@ public void accept(String peerIpAndPort) {
new Runnable() {
@Override
public void run() {
fetchGroupList(peerIpAndPort);
updateNodeVersion(peerIpAndPort);
try {
fetchGroupList(peerIpAndPort);
updateNodeVersion(peerIpAndPort);
} catch (Exception e) {
logger.warn(
"GetNodeVersionHandler exception, error message: {}",
e.getMessage(),
e);
}
}
});
}
Expand Down Expand Up @@ -210,10 +217,17 @@ public void registerBlockNumberNotifyHandler() {
new Runnable() {
@Override
public void run() {
onReceiveBlockNotifyImpl(
version,
peerIpAndPort,
blockNumberNotifyMessage);
try {
onReceiveBlockNotifyImpl(
version,
peerIpAndPort,
blockNumberNotifyMessage);
} catch (Exception e) {
logger.warn(
"registerBlockNumberNotifyHandler exception, e: {}",
e.getMessage(),
e);
}
}
});
BlockNumberNotifyHandler handler =
Expand All @@ -228,7 +242,14 @@ public void accept(String disconnectedEndpoint) {
new Runnable() {
@Override
public void run() {
onDisconnect(disconnectedEndpoint);
try {
onDisconnect(disconnectedEndpoint);
} catch (Exception e) {
logger.warn(
"BlockNumberNotifyHandler exception, e: {}",
e.getMessage(),
e);
}
}
});
}
Expand Down