update at 2021-02-07 22:11:59 by ehlxr
continuous-integration/drone/push Build is passing Details

master
ehlxr 2021-02-07 22:11:59 +08:00
parent 5c8712914b
commit e929cd180f
16 changed files with 230 additions and 96 deletions

View File

@ -12,9 +12,9 @@ steps:
- name: m2_cache # The Volume's name
path: /root/.m2 # The path in the container
commands:
- mvn clean install -DskipTests -e -U
- cp ./did-server/target/did-server*.jar ./docker
- echo -n "$(date -d @${DRONE_BUILD_CREATED} '+%Y%m%d_%H%M%S')_${DRONE_BUILD_NUMBER}, $(grep '<version>.*</version>' pom.xml | head -1 | awk -F '[>,<]' '{print $3}'), latest" > .tags
- mvn clean install -DskipTests -e -U
- cp ./did-server/target/did-server*.jar ./docker
- echo -n "$(date -d @${DRONE_BUILD_CREATED} '+%Y%m%d_%H%M%S')_${DRONE_BUILD_NUMBER}, $(grep '<version>.*</version>' pom.xml | head -1 | awk -F '[>,<]' '{print $3}'), latest" > .tags
- name: docker
image: plugins/docker
@ -50,8 +50,8 @@ steps:
type: markdown
when:
status:
- failure
- success
- failure
- success
volumes:
- name: m2_cache # The name use in this pipeline,

View File

@ -9,9 +9,9 @@ steps:
- name: build
image: maven
commands:
- mvn clean install -DskipTests -e -U
- cp ./did-server/target/did-server*.jar ./docker
- echo -n "$(date -d @${DRONE_BUILD_CREATED} '+%Y%m%d_%H%M%S')_${DRONE_BUILD_NUMBER}, $(grep '<version>.*</version>' pom.xml | head -1 | awk -F '[>,<]' '{print $3}'), latest" > .tags
- mvn clean install -DskipTests -e -U
- cp ./did-server/target/did-server*.jar ./docker
- echo -n "$(date -d @${DRONE_BUILD_CREATED} '+%Y%m%d_%H%M%S')_${DRONE_BUILD_NUMBER}, $(grep '<version>.*</version>' pom.xml | head -1 | awk -F '[>,<]' '{print $3}'), latest" > .tags
- name: docker
image: plugins/docker
@ -47,5 +47,5 @@ steps:
type: markdown
when:
status:
- failure
- success
- failure
- success

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>did-parent</artifactId>

View File

@ -7,18 +7,12 @@ import java.util.Map;
*/
public class Constants {
private static final Map<String, String> SYS_ENV = System.getenv();
public static String getEnv(String key) {
return SYS_ENV.get(key) == null ? "" : SYS_ENV.get(key);
}
public static String SERVER_HOST = "localhost";
/**
* HTTP SDK
*/
public static int HTTP_PORT = 16830;
public static int SDK_PORT = 16831;
/**
* ID0~31
* ID0~31
@ -27,27 +21,26 @@ public class Constants {
*/
public static long DATACENTER_ID = 1;
public static long MACHINES_ID = 1;
/**
* Server
*/
public static int HANDLE_HTTP_TPS = 10000;
public static int HANDLE_SDK_TPS = 50000;
/**
* sdk client
*/
public static int SDK_CLIENT_ASYNC_TPS = 100000;
public static int SDK_CLIENT_ONEWAY_TPS = 100000;
public static int ACQUIRE_TIMEOUTMILLIS = 5000;
/**
* sdk client
*/
public static int SDK_CLIENT_TIMEOUTMILLIS = 2000;
private Constants() {
}
public static String getEnv(String key) {
return SYS_ENV.get(key) == null ? "" : SYS_ENV.get(key);
}
}

View File

@ -0,0 +1,159 @@
package io.github.ehlxr.did.common;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.node.MissingNode;
import io.netty.util.internal.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.SimpleDateFormat;
/**
* JSON
*
* @author ehlxr
* @since 2020/5/6.
*/
@SuppressWarnings({"unused", "unchecked"})
public class JsonUtils {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private static final Logger logger = LoggerFactory.getLogger(JsonUtils.class);
static {
// 对象的所有字段全部列入
OBJECT_MAPPER.setSerializationInclusion(JsonInclude.Include.ALWAYS);
// 取消默认转换 timestamps 形式
OBJECT_MAPPER.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
// 忽略空 bean 转 JSON 的错误
OBJECT_MAPPER.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
// 所有的日期格式都统一为以下的样式yyyy-MM-dd HH:mm:ss
OBJECT_MAPPER.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
// 忽略在 JSON 字符串中存在,但是在 java 对象中不存在对应属性的情况
OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}
public static ObjectMapper om() {
return OBJECT_MAPPER;
}
/**
* JsonNode
*
* @param obj
* @param <T>
* @return {@link JsonNode}
*/
public static <T> JsonNode obj2JsonNode(T obj) {
try {
return OBJECT_MAPPER.readTree(obj2String(obj));
} catch (JsonProcessingException e) {
logger.error("", e);
return MissingNode.getInstance();
}
}
/**
* JSON
*
* @param obj
* @param <T>
* @return JSON
*/
public static <T> String obj2String(T obj) {
if (obj == null) {
return "";
}
try {
return obj instanceof String ? (String) obj : OBJECT_MAPPER.writeValueAsString(obj);
} catch (JsonProcessingException e) {
logger.error("", e);
return "";
}
}
/**
* JSON
*
* @param obj
* @param <T>
* @return JSON
*/
public static <T> String obj2StringPretty(T obj) {
if (obj == null) {
return "";
}
try {
return obj instanceof String ?
(String) obj :
OBJECT_MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(obj);
} catch (JsonProcessingException e) {
logger.error("", e);
return "";
}
}
/**
*
*
* @param str
* @param clazz class
* @param <T>
* @return
*/
public static <T> T string2Obj(String str, Class<T> clazz) {
if (StringUtil.isNullOrEmpty(str) || clazz == null) {
throw new RuntimeException("json string to obj param should not empty");
}
try {
return clazz.equals(String.class) ? (T) str : OBJECT_MAPPER.readValue(str, clazz);
} catch (JsonProcessingException e) {
logger.error("", e);
return null;
}
}
/**
*
*
* @param str
* @param typeReference typeReference
* @param <T>
* @return
*/
public static <T> T string2Obj(String str, TypeReference<T> typeReference) {
if (StringUtil.isNullOrEmpty(str) || typeReference == null) {
throw new RuntimeException("json string to obj param should not empty");
}
try {
return typeReference.getType().equals(String.class) ?
(T) str :
OBJECT_MAPPER.readValue(str, typeReference);
} catch (JsonProcessingException e) {
logger.error("", e);
return null;
}
}
/**
*
*
* @param str
* @param collectionClazz class
* @param elementClazzes class
* @param <T>
* @return
*/
public static <T> T string2Obj(String str, Class<?> collectionClazz, Class<?>... elementClazzes) {
JavaType javaType = OBJECT_MAPPER.getTypeFactory().constructParametricType(collectionClazz, elementClazzes);
try {
return OBJECT_MAPPER.readValue(str, javaType);
} catch (JsonProcessingException e) {
logger.error("", e);
return null;
}
}
}

View File

@ -1,13 +1,9 @@
package io.github.ehlxr.did.common;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.netty.util.internal.StringUtil;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Objects;
/**
@ -16,6 +12,7 @@ import java.util.Objects;
* @author ehlxr
* @since 2020/3/18.
*/
@SuppressWarnings("unused")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class Result<T> implements Serializable {
private static final long serialVersionUID = -2758720512348727698L;
@ -133,18 +130,7 @@ public class Result<T> implements Serializable {
@Override
public String toString() {
try {
ObjectMapper om = new ObjectMapper();
// 取消时间的转化格式, 默认是时间戳
om.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
// 设置时间格式
om.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
om.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
om.configure(SerializationFeature.WRITE_SINGLE_ELEM_ARRAYS_UNWRAPPED, false);
return om.writeValueAsString(this);
} catch (JsonProcessingException e) {
return "";
}
return JsonUtils.obj2String(this);
}
}

View File

@ -27,12 +27,18 @@ public class SdkProto {
this.did = did;
}
public static SdkProtoBuilder newBuilder() {
return new SdkProtoBuilder();
}
public int getRqid() {
return rqid;
}
public static SdkProtoBuilder newBuilder() {
return new SdkProtoBuilder();
public void setRqid(int rqid) {
if (rqid > 0) {
this.rqid = rqid;
}
}
public long getDid() {
@ -45,16 +51,7 @@ public class SdkProto {
@Override
public String toString() {
return "SdkProto{" +
"rqid=" + rqid +
", did=" + did +
'}';
}
public void setRqid(int rqid) {
if (rqid > 0) {
this.rqid = rqid;
}
return JsonUtils.obj2String(this);
}
public static final class SdkProtoBuilder {

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>did-parent</artifactId>

View File

@ -84,7 +84,7 @@ public abstract class AbstractClient implements Client {
@Override
public Result<SdkProto> invokeSync(long timeoutMillis) {
final Channel channel = channelFuture.channel();
if (channel.isActive()) {
if (channel.isOpen() && channel.isActive()) {
final SdkProto sdkProto = new SdkProto();
final int rqid = sdkProto.getRqid();
try {
@ -115,7 +115,7 @@ public abstract class AbstractClient implements Client {
}
} else {
NettyUtil.closeChannel(channel);
return Result.fail(NettyUtil.parseRemoteAddr(channel));
return Result.fail("channel " + NettyUtil.parseRemoteAddr(channel) + "is not active!");
}
}
@ -133,37 +133,36 @@ public abstract class AbstractClient implements Client {
if (channelFuture.isSuccess()) {
return;
}
// 代码执行到些说明发送失败,需要释放资源
logger.error("send a request command to channel <{}> failed.",
NettyUtil.parseRemoteAddr(channel), channelFuture.cause());
REPONSE_MAP.remove(rqid);
responseFuture.setCause(channelFuture.cause());
responseFuture.putResponse(null);
try {
responseFuture.executeInvokeCallback();
} catch (Exception e) {
logger.warn("excute callback in writeAndFlush addListener, and callback throw", e);
} finally {
responseFuture.release();
}
logger.warn("send a request command to channel <{}> failed.",
NettyUtil.parseRemoteAddr(channel), channelFuture.cause());
responseFuture.executeInvokeCallback();
responseFuture.release();
});
} catch (Exception e) {
responseFuture.release();
logger.warn("send a request to channel <{}> Exception",
NettyUtil.parseRemoteAddr(channel), e);
throw new Exception(NettyUtil.parseRemoteAddr(channel), e);
String msg = String.format("send a request to channel <%s> Exception",
NettyUtil.parseRemoteAddr(channel));
logger.error(msg, e);
throw new Exception(msg, e);
}
} else {
String info = String.format("invokeAsyncImpl tryAcquire semaphore timeout, %dms, waiting thread " +
String msg = String.format("invokeAsyncImpl tryAcquire semaphore timeout, %dms, waiting thread " +
"nums: %d semaphoreAsyncValue: %d",
timeoutMillis, this.asyncSemaphore.getQueueLength(), this.asyncSemaphore.availablePermits());
logger.warn(info);
throw new Exception(info);
logger.error(msg);
throw new Exception(msg);
}
} else {
NettyUtil.closeChannel(channel);
throw new Exception(NettyUtil.parseRemoteAddr(channel));
throw new Exception(String.format("channel %s is not active!", NettyUtil.parseRemoteAddr(channel)));
}
}

View File

@ -57,11 +57,12 @@ public class SdkClient extends AbstractClient {
});
try {
channelFuture = bootstrap.connect(host, port).sync();
channelFuture.channel().closeFuture().addListener((ChannelFutureListener) channelFuture -> {
logger.warn("client channel close.", channelFuture.cause());
});
channelFuture = bootstrap.connect(host, port)
.sync()
.channel()
.closeFuture()
.addListener((ChannelFutureListener) channelFuture ->
logger.warn("client channel close.", channelFuture.cause()));
InetSocketAddress address = (InetSocketAddress) channelFuture.channel().remoteAddress();
logger.info("SdkClient start success, host is {}, port is {}", address.getHostName(), address.getPort());

View File

@ -31,14 +31,14 @@ public class DidSdkTest {
@Test
public void didSdkTest() throws Exception {
// 测试同步请求关注rqid是否对应
// 测试同步请求
for (int i = 0; i < NUM; i++) {
Result<SdkProto> resultProto = client.invokeSync();
System.out.println(resultProto);
}
System.out.println("invokeync test finish");
// 测试异步请求关注rqid是否对应
// 测试异步请求
final CountDownLatch countDownLatch = new CountDownLatch(NUM);
for (int i = 0; i < NUM; i++) {
client.invokeAsync(responseFuture -> {

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>did-parent</artifactId>

View File

@ -91,6 +91,20 @@ public class SnowFlake {
this.machineId = machineId;
}
public static void main(String[] args) {
SnowFlake snowFlake = new SnowFlake(2, 3);
long start = System.currentTimeMillis();
for (int i = 0; i < (1 << 18); i++) {
System.out.println(i + ": " + snowFlake.nextId());
}
long end = System.currentTimeMillis();
System.out.println(end - start);
}
public static SnowFlakeBuilder newBuilder() {
return new SnowFlakeBuilder();
}
/**
* ID
*/
@ -130,20 +144,6 @@ public class SnowFlake {
return System.currentTimeMillis();
}
public static void main(String[] args) {
SnowFlake snowFlake = new SnowFlake(2, 3);
long start = System.currentTimeMillis();
for (int i = 0; i < (1 << 18); i++) {
System.out.println(i + ": " + snowFlake.nextId());
}
long end = System.currentTimeMillis();
System.out.println(end - start);
}
public static SnowFlakeBuilder newBuilder() {
return new SnowFlakeBuilder();
}
public static final class SnowFlakeBuilder {
private long datacenterId;
private long machineId;

View File

@ -31,7 +31,7 @@ public class SdkServerDecoder extends FixedLengthFrameDecoder {
} catch (Exception e) {
logger.error("decode exception, " + NettyUtil.parseRemoteAddr(ctx.channel()), e);
NettyUtil.closeChannel(ctx.channel());
}finally {
} finally {
if (buf != null) {
buf.release();
}
@ -42,7 +42,7 @@ public class SdkServerDecoder extends FixedLengthFrameDecoder {
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
Channel channel = ctx.channel();
logger.error("SdkServerDecoder channel [{}] error and will be closed", NettyUtil.parseRemoteAddr(channel),cause);
logger.error("SdkServerDecoder channel [{}] error and will be closed", NettyUtil.parseRemoteAddr(channel), cause);
NettyUtil.closeChannel(channel);
}
}

View File

@ -38,9 +38,8 @@ public class SdkServerHandler extends SimpleChannelInboundHandler<SdkProto> {
semaphore.release();
} else {
String info = String.format("SdkServerHandler tryAcquire semaphore timeout, %dms, waiting thread " + "nums: %d availablePermit: %d",
logger.error("tryAcquire timeout after {}ms, {} threads waiting to acquire, {} permits available in this semaphore",
Constants.ACQUIRE_TIMEOUTMILLIS, this.semaphore.getQueueLength(), this.semaphore.availablePermits());
logger.error(info);
}
ctx.channel().

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>