From 23c14ff738f281f4d0f8bf3eb2038e44772fe327 Mon Sep 17 00:00:00 2001 From: "Jixiang.jjx" Date: Tue, 15 Mar 2022 11:36:29 +0800 Subject: [PATCH] [ISSUE #3949] Add Base Initialization for test cases. --- .../client/impl/MQClientAPIExtImpl.java | 2 +- .../proxy/client/TopicRouteCache.java | 4 +- .../mqconstructor/MQClientAPIConstructor.java | 5 +- .../ConfigurationManagerTest.java | 23 +- .../configuration/InitConfigurationTest.java | 63 +++ .../grpc/service/LocalGrpcServiceTest.java | 17 +- .../rmq-proxy-home/conf/logback_proxy.xml | 420 ++++++++++++++++++ 7 files changed, 494 insertions(+), 40 deletions(-) create mode 100644 proxy/src/test/java/org/apache/rocketmq/proxy/configuration/InitConfigurationTest.java create mode 100644 proxy/src/test/resources/rmq-proxy-home/conf/logback_proxy.xml diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIExtImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIExtImpl.java index d3713c58cb..ce3c548424 100644 --- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIExtImpl.java +++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIExtImpl.java @@ -78,7 +78,7 @@ public class MQClientAPIExtImpl { ex = new MQClientException("wait response timeout " + responseFuture.getTimeoutMillis() + "ms", responseFuture.getCause()); } else { - ex = new MQClientException("unknow reseaon", responseFuture.getCause()); + ex = new MQClientException("unknown reason", responseFuture.getCause()); } return ex; } diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/client/TopicRouteCache.java b/proxy/src/main/java/org/apache/rocketmq/proxy/client/TopicRouteCache.java index 1e346266cd..287841dc1b 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/client/TopicRouteCache.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/client/TopicRouteCache.java @@ -73,7 +73,7 @@ public class TopicRouteCache { return res; } - protected static boolean routeDataIsValid(TopicRouteData routeData) { + protected static boolean isTopicRouteValid(TopicRouteData routeData) { return routeData != null && routeData.getQueueDatas() != null && !routeData.getQueueDatas().isEmpty() && routeData.getBrokerDatas() != null && !routeData.getBrokerDatas().isEmpty(); } @@ -97,7 +97,7 @@ public class TopicRouteCache { try { TopicRouteData topicRouteData = loadTopicRouteData(topic); - if (routeDataIsValid(topicRouteData)) { + if (isTopicRouteValid(topicRouteData)) { MessageQueueWrapper tmp = new MessageQueueWrapper(topic, topicRouteData); log.info("load {} from namesrv. topic: {}, queue: {}", loaderName(), topic, tmp); return tmp; diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/client/mqconstructor/MQClientAPIConstructor.java b/proxy/src/main/java/org/apache/rocketmq/proxy/client/mqconstructor/MQClientAPIConstructor.java index b9a3773060..f3e276c7a7 100644 --- a/proxy/src/main/java/org/apache/rocketmq/proxy/client/mqconstructor/MQClientAPIConstructor.java +++ b/proxy/src/main/java/org/apache/rocketmq/proxy/client/mqconstructor/MQClientAPIConstructor.java @@ -29,11 +29,14 @@ public class MQClientAPIConstructor extends AbstractRocketMQClientConstructor + + + + + + ${user.home}/logs/rocketmqlogs/proxy.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/proxy.%i.log.gz + 1 + 20 + + + 128MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/grpc.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/grpc.%i.log.gz + 1 + 20 + + + 128MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/broker_default.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/broker_default.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/broker.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/broker.%i.log.gz + 1 + 20 + + + 128MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/protection.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/protection.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/watermark.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/watermark.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/store.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/store.%i.log.gz + 1 + 10 + + + 128MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/remoting.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/remoting.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/storeerror.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/storeerror.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/transaction.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/transaction.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/lock.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/lock.%i.log.gz + 1 + 5 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/filter.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/filter.%i.log.gz + 1 + 10 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/stats.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/stats.%i.log.gz + 1 + 5 + + + 100MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p - %m%n + UTF-8 + + + + + ${user.home}/logs/rocketmqlogs/${brokerLogDir}/commercial.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/${brokerLogDir}/commercial.%i.log.gz + 1 + 10 + + + 500MB + + + + + ${user.home}/logs/rocketmqlogs/pop.log + true + + ${user.home}/logs/rocketmqlogs/otherdays/pop.%i.log + + 1 + 20 + + + 128MB + + + %d{yyy-MM-dd HH:mm:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + + true + + %d{yyy-MM-dd HH\:mm\:ss,GMT+8} %p %t - %m%n + UTF-8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +