chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve metrics.

Browse Source
This commit is contained in:
Chuanyi Li
2018-08-19 16:51:08 +08:00
parent 2656d1d2af
commit 2784f33b52
15 changed files with 335 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/alibaba/otter/canal/server/netty/handler/SessionHandler.java
View File

@@ -220,6 +220,7 @@ public class SessionHandler extends SimpleChannelHandler {
} else {
clientIdentity = new ClientIdentity(ack.getDestination(), Short.valueOf(ack.getClientId()));
embeddedServer.ack(clientIdentity, ack.getBatchId());
new ChannelFutureAggregator(ack.getDestination(), ack, packet.getType(), 0, System.nanoTime() - start).operationComplete(null);
}
} else {
byte[] errorBytes = NettyUtils.errorPacket(401, MessageFormatter.format("destination or clientId is null", ack.toString()).getMessage());
@@ -239,6 +240,7 @@ public class SessionHandler extends SimpleChannelHandler {
} else {
embeddedServer.rollback(clientIdentity, rollback.getBatchId()); // 只回滚单个批次
}
new ChannelFutureAggregator(rollback.getDestination(), rollback, packet.getType(), 0, System.nanoTime() - start).operationComplete(null);
} else {
byte[] errorBytes = NettyUtils.errorPacket(401, MessageFormatter.format("destination or clientId is null", rollback.toString()).getMessage());
NettyUtils.write(ctx.getChannel(), errorBytes, new ChannelFutureAggregator(rollback.getDestination(),

2
server/src/main/java/com/alibaba/otter/canal/server/netty/listener/ChannelFutureAggregator.java
View File

@@ -43,7 +43,7 @@ public class ChannelFutureAggregator implements ChannelFutureListener {
@Override
public void operationComplete(ChannelFuture future) {
// profiling after I/O operation
if (future.getCause() != null) {
if (future != null && future.getCause() != null) {
result.channelError = future.getCause();
}
profiler().profiling(result);