From 96a56af0e33225051ef035144135e426ada52f0d Mon Sep 17 00:00:00 2001 From: Michael Wei Date: Mon, 11 Dec 2017 20:44:40 -0800 Subject: [PATCH] Use void promise when sending --- .../org/corfudb/infrastructure/NettyServerRouter.java | 2 +- .../org/corfudb/runtime/clients/NettyClientRouter.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java b/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java index b1771e20e3f..4ae79d9d503 100644 --- a/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java +++ b/infrastructure/src/main/java/org/corfudb/infrastructure/NettyServerRouter.java @@ -143,7 +143,7 @@ public void removeServer(AbstractServer server) { */ public void sendResponse(ChannelHandlerContext ctx, CorfuMsg inMsg, CorfuMsg outMsg) { outMsg.copyBaseFields(inMsg); - ctx.writeAndFlush(outMsg); + ctx.writeAndFlush(outMsg, ctx.voidPromise()); log.trace("Sent response: {}", outMsg); } diff --git a/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java b/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java index cc86964bf5b..f7d9db9427b 100644 --- a/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java +++ b/runtime/src/main/java/org/corfudb/runtime/clients/NettyClientRouter.java @@ -522,9 +522,9 @@ public CompletableFuture sendMessageAndGetCompletable(ChannelHandlerConte outstandingRequests.put(thisRequest, cf); // Write the message out to the channel. if (ctx == null) { - channel.writeAndFlush(message); + channel.writeAndFlush(message, channel.voidPromise()); } else { - ctx.writeAndFlush(message); + ctx.writeAndFlush(message, ctx.voidPromise()); } log.trace("Sent message: {}", message); final CompletableFuture cfElapsed = cf.thenApply(x -> { @@ -568,7 +568,7 @@ public void sendMessage(ChannelHandlerContext ctx, CorfuMsg message) { message.setRequestID(thisRequest); message.setEpoch(epoch); // Write this message out on the channel. - outContext.writeAndFlush(message); + outContext.writeAndFlush(message, outContext.voidPromise()); // MetricsUtils.incConditionalCounter(MetricsUtils // .isMetricsCollectionEnabled(), counterAsyncOpSent, 1); log.trace("Sent one-way message: {}", message); @@ -585,7 +585,7 @@ public void sendMessage(ChannelHandlerContext ctx, CorfuMsg message) { public void sendResponseToServer(ChannelHandlerContext ctx, CorfuMsg inMsg, CorfuMsg outMsg) { outMsg.copyBaseFields(inMsg); outMsg.setEpoch(epoch); - ctx.writeAndFlush(outMsg); + ctx.writeAndFlush(outMsg, ctx.voidPromise()); log.trace("Sent response: {}", outMsg); }