test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 12:17:43 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

async not needed callback

Browse Source
This commit is contained in:
CalvinKirs 2021-02-02 00:25:31 +08:00
parent 3ba03213fe
commit c9daf6a425
9 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/rpc/base/Rpc.java
View File

@ -40,6 +40,8 @@ public @interface Rpc {
boolean ack() default false;
boolean callBack() default false;
//todo It is better to set the timeout period for synchronous calls
/**

10
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/rpc/client/ConsumerConfig.java
View File

@ -33,6 +33,8 @@ public class ConsumerConfig {
private Boolean async = ConsumerConfigConstants.DEFAULT_SYNC;
private Boolean callBack = ConsumerConfigConstants.DEFAULT_CALL_BACK;
private Integer retries = ConsumerConfigConstants.DEFAULT_RETRIES;
public Class<? extends AbstractRpcCallBack> getServiceCallBackClass() {
@ -74,4 +76,12 @@ public class ConsumerConfig {
void setRetries(Integer retries) {
this.retries = retries;
}
public Boolean getCallBack() {
return callBack;
}
public void setCallBack(Boolean callBack) {
this.callBack = callBack;
}
}

4
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/rpc/client/ConsumerInterceptor.java
View File

@ -20,6 +20,7 @@ package org.apache.dolphinscheduler.rpc.client;
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.rpc.base.Rpc;
import org.apache.dolphinscheduler.rpc.common.AbstractRpcCallBack;
import org.apache.dolphinscheduler.rpc.common.RpcRequest;
import org.apache.dolphinscheduler.rpc.common.RpcResponse;
import org.apache.dolphinscheduler.rpc.protocol.EventType;
@ -102,6 +103,9 @@ public class ConsumerInterceptor {
Rpc rpc = method.getAnnotation(Rpc.class);
consumerConfig.setAsync(rpc.async());
consumerConfig.setServiceCallBackClass(rpc.serviceCallback());
if (!rpc.serviceCallback().isInstance(AbstractRpcCallBack.class)) {
consumerConfig.setCallBack(true);
}
consumerConfig.setAckCallBackClass(rpc.ackCallback());
consumerConfig.setRetries(rpc.retries());
}

2
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/rpc/common/ConsumerConfigConstants.java
View File

@ -29,4 +29,6 @@ public class ConsumerConfigConstants {
public static final Boolean DEFAULT_SYNC = false;
public static final Integer DEFAULT_RETRIES = 3;
public static final Boolean DEFAULT_CALL_BACK = false;
}

3
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/rpc/remote/NettyClientHandler.java
View File

@ -77,7 +77,10 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter {
RpcRequestTable.remove(reqId);
future.done(rsp);
return;
}
if (Boolean.FALSE.equals(consumerConfig.getCallBack())) {
return;
}
if (rsp.getStatus() == 0) {

5
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/rpc/IUserService.java
View File

@ -24,8 +24,11 @@ import org.apache.dolphinscheduler.rpc.base.Rpc;
*/
public interface IUserService {
@Rpc(async = true, serviceCallback = UserCallback.class, retries = 9999)
@Rpc(async = true, serviceCallback = UserCallback.class)
Boolean say(String s);
Integer hi(int num);
@Rpc(async = true)
Boolean callBackIsFalse(String s);
}

2
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/rpc/RpcTest.java
View File

@ -51,6 +51,8 @@ public class RpcTest {
result = userService.hi(4);
Assert.assertSame(5, result);
userService.say("sync");
userService.callBackIsFalse("async no call back");
userService.hi(999999);
}
@After

9
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/rpc/UserCallback.java
View File

@ -19,12 +19,19 @@ package org.apache.dolphinscheduler.rpc;
import org.apache.dolphinscheduler.rpc.common.AbstractRpcCallBack;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* UserCallback
*/
public class UserCallback extends AbstractRpcCallBack {
private static final Logger logger = LoggerFactory.getLogger(UserCallback.class);
@Override
public void run(Object object) {
String msg = (String) object;
logger.debug("Kris---------------------------------userCallBack msg is {}", msg);
}
}

15
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/rpc/UserService.java
View File

@ -19,21 +19,34 @@ package org.apache.dolphinscheduler.rpc;
import org.apache.dolphinscheduler.rpc.base.RpcService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* UserService
*/
@RpcService("IUserService")
public class UserService implements IUserService {
private static final Logger logger = LoggerFactory.getLogger(UserService.class);
@Override
public Boolean say(String s) {
logger.info("Kris UserService say-------------------------------Synchronous call msg{}", s);
return true;
}
@Override
public Integer hi(int num) {
System.out.println("hihihihi+" + num);
logger.info("Kris UserService hi-------------------------------async call msg{}", num);
return ++num;
}
@Override
public Boolean callBackIsFalse(String s) {
logger.info("Kris UserService callBackIsFalse-------------------------------async call msg{}", s);
return null;
}
}