From 2ab98b02c1cd6c91753970c3367417622b887244 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sat, 24 Aug 2024 08:54:58 +0800 Subject: [PATCH] =?UTF-8?q?pom(grpc):=20=E5=8D=87=E7=BA=A7guava=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 21 ++++--------------- .../rpc/client/GrpcClientInvokeHandler.java | 17 +++++++-------- .../snail-job-common-core/pom.xml | 6 ------ .../server/common/rpc/client/GrpcChannel.java | 2 +- .../common/rpc/server/GrpcInterceptor.java | 2 +- 5 files changed, 14 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 4ec9e35b7..746612b8f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,10 @@ 1.2.17 1.3.4 3.0.2 - 32.0.0-jre - 1.64.2 - 2.43.0 - 3.25.4 + 33.3.0-jre + 1.66.0 + 2.41.0 + 3.25.3 @@ -203,30 +203,17 @@ grpc-util ${grpc-java.version} - - io.grpc - grpc-testing - ${grpc-java.version} - test - com.google.api.grpc proto-google-common-protos ${proto-google-common-protos.version} - com.google.protobuf protobuf-java ${protobuf-java.version} - - - - - - diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/GrpcClientInvokeHandler.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/GrpcClientInvokeHandler.java index 65851162d..434bec9ff 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/GrpcClientInvokeHandler.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/rpc/client/GrpcClientInvokeHandler.java @@ -68,21 +68,20 @@ public class GrpcClientInvokeHandler> implements Invoca ListenableFuture future = GrpcChannel.sendOfUnary(annotation.path(), JsonUtil.toJsonString(args), reqId); SnailJobLog.LOCAL.debug("request complete requestId:[{}] 耗时:[{}ms]", sw.getTotalTimeMillis(), reqId); + if (future == null) { + return (R) new SnailJobRpcResult(StatusEnum.NO.getStatus(), "future is nulll", null, reqId); + } if (async) { - if (future == null) { - return null; - } - Futures.addCallback(future, new FutureCallback<>() { @Override public void onSuccess(final GrpcResult result) { ByteBuffer byteBuffer = result.getData().getValue().asReadOnlyByteBuffer(); - String str = JsonUtil.parseObject(new ByteBufferBackedInputStream(byteBuffer), String.class); + Object obj = JsonUtil.parseObject(new ByteBufferBackedInputStream(byteBuffer), Object.class); consumer.accept( - (R) new SnailJobRpcResult(result.getStatus(), result.getMessage(), str, result.getReqId())); + (R) new SnailJobRpcResult(result.getStatus(), result.getMessage(), obj, result.getReqId())); } @Override @@ -96,10 +95,10 @@ public class GrpcClientInvokeHandler> implements Invoca } else { try { - GrpcResult result = future.get(Integer.MAX_VALUE, TimeUnit.MILLISECONDS); + GrpcResult result = future.get(timeout, unit); ByteBuffer byteBuffer = result.getData().getValue().asReadOnlyByteBuffer(); - String str = JsonUtil.parseObject(new ByteBufferBackedInputStream(byteBuffer), String.class); - return (R) new Result(result.getStatus(), result.getMessage(), str); + Object obj = JsonUtil.parseObject(new ByteBufferBackedInputStream(byteBuffer), Object.class); + return (R) new SnailJobRpcResult(result.getStatus(), result.getMessage(), obj, result.getReqId()); } catch (ExecutionException e) { throw e.getCause(); } catch (TimeoutException e) { diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml index e51bd88b8..c7e111c43 100644 --- a/snail-job-common/snail-job-common-core/pom.xml +++ b/snail-job-common/snail-job-common-core/pom.xml @@ -85,12 +85,6 @@ com.google.api.grpc proto-google-common-protos - - - javax.annotation - javax.annotation-api - 1.3.2 - diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java index 3d55eb8ce..71aa9fdf1 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/client/GrpcChannel.java @@ -67,7 +67,7 @@ public class GrpcChannel { final long reqId) { ManagedChannel channel = CHANNEL_MAP.get(Pair.of(hostId, hostIp)); - if (Objects.isNull(channel) || !channel.isShutdown() || !channel.isShutdown()) { + if (Objects.isNull(channel) || channel.isShutdown() || channel.isTerminated()) { removeChannel(channel); channel = connect(hostId, hostIp, port); if (Objects.isNull(channel)) { diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcInterceptor.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcInterceptor.java index ab609ed0d..3bf223f2a 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcInterceptor.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcInterceptor.java @@ -26,7 +26,7 @@ public class GrpcInterceptor implements ServerInterceptor { try { return Contexts.interceptCall(context, serverCall, metadata, serverCallHandler); } finally { - log.info("method invoked: {} cast:{}ms", fullMethodName, System.currentTimeMillis() - start); + log.debug("method invoked: {} cast:{}ms", fullMethodName, System.currentTimeMillis() - start); } }