fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: some bug

Browse Source
This commit is contained in:
hongqiaowei
2021-01-13 14:31:24 +08:00
parent 44bf38fa4e
commit 6aae33404e
9 changed files with 215 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -35,7 +35,7 @@
<properties>
<java.version>1.8</java.version>
<spring-framework.version>5.2.12.RELEASE</spring-framework.version>
<reactor-bom.version>Dysprosium-SR15</reactor-bom.version>
<reactor-bom.version>Dysprosium-SR16</reactor-bom.version>
<lettuce.version>5.3.5.RELEASE</lettuce.version>
<nacos.version>0.2.7</nacos.version>
<netty.version>4.1.56.Final</netty.version>
@@ -177,6 +177,18 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
</dependency>
<dependency>
<groupId>it.ozimov</groupId>
<artifactId>embedded-redis</artifactId>
<version>0.7.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.noear</groupId>

2
src/main/java/we/config/FlowStatSchedConfig.java
View File

@@ -177,7 +177,7 @@ public class FlowStatSchedConfig extends SchedConfig {
b.append(_minRespTime); b.append(w.getMin());
b.append(Constants.Symbol.RIGHT_BRACE);
String msg = b.toString();
if ("kafka".equals(dest)) {
if ("kafka".equals(dest)) { // for internal use
log.warn(msg, LogService.HANDLE_STGY, LogService.toKF(queue));
} else {
rt.convertAndSend(queue, msg).subscribe();

15
src/main/java/we/filter/FlowControlFilter.java
View File

@@ -79,8 +79,10 @@ public class FlowControlFilter extends ProxyAggrFilter {
ResourceRateLimitConfig globalConfig = rlc;
boolean concurrentOrRpsExceed = false;
boolean globalExceed = concurrentOrRpsExceed;
if (rlc != null && rlc.isEnable()) {
concurrentOrRpsExceed = !flowStat.incrRequest(rlc.resource, currentTimeSlot, rlc.concurrents, rlc.qps);
globalExceed = concurrentOrRpsExceed;
}
if (!concurrentOrRpsExceed) {
@@ -92,9 +94,15 @@ public class FlowControlFilter extends ProxyAggrFilter {
if (rlc == null || !rlc.isEnable()) {
} else {
concurrentOrRpsExceed = !flowStat.incrRequest(service, currentTimeSlot, rlc.concurrents, rlc.qps);
// if (!concurrentOrRpsExceed) {
// flowStat.incrRequest(reqPath, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
// }
}
} else {
concurrentOrRpsExceed = !flowStat.incrRequest(service, currentTimeSlot, rlc.concurrents, rlc.qps);
// if (!concurrentOrRpsExceed) {
// flowStat.incrRequest(reqPath, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
// }
}
} else { // should not reach here for now
concurrentOrRpsExceed = !flowStat.incrRequest(reqPath, currentTimeSlot, rlc.concurrents, rlc.qps);
@@ -104,7 +112,7 @@ public class FlowControlFilter extends ProxyAggrFilter {
}
}
if (rlc == null || !rlc.isEnable()) {
if ((globalConfig == null && rlc == null) || (globalConfig == null && !rlc.isEnable()) || (rlc == null && !globalConfig.isEnable())) {
flowStat.incrRequest(ResourceRateLimitConfig.GLOBAL, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
flowStat.incrRequest(service, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
// flowStat.incrRequest(reqPath, currentTimeSlot, Long.MAX_VALUE, Long.MAX_VALUE);
@@ -113,12 +121,9 @@ public class FlowControlFilter extends ProxyAggrFilter {
}
if (concurrentOrRpsExceed) {
if (rlc.type == ResourceRateLimitConfig.Type.API || rlc.type == ResourceRateLimitConfig.Type.SERVICE || rlc.type == ResourceRateLimitConfig.Type.SERVICE_DEFAULT) {
if (globalConfig != null && globalConfig.isEnable()) {
if (!globalExceed) {
flowStat.decrConcurrentRequest(ResourceRateLimitConfig.GLOBAL, currentTimeSlot);
}
}
StringBuilder b = ThreadContext.getStringBuilder();
b.append(WebUtils.getClientService(exchange)).append(Constants.Symbol.SPACE).append(WebUtils.getClientReqPath(exchange));

2
src/main/java/we/plugin/stat/StatPluginFilter.java
View File

@@ -119,7 +119,7 @@ public class StatPluginFilter extends PluginFilter {
if (StringUtils.isBlank(fizzAccessStatTopic)) {
rt.convertAndSend(fizzAccessStatChannel, b.toString()).subscribe();
} else {
log.info(b.toString(), LogService.HANDLE_STGY, LogService.toKF(fizzAccessStatTopic));
log.info(b.toString(), LogService.HANDLE_STGY, LogService.toKF(fizzAccessStatTopic)); // for internal use
}
}

33
src/test/java/we/redis/RedisConfiguration.java Normal file
View File

@@ -0,0 +1,33 @@
// package we.redis;
//
// import org.springframework.context.annotation.Bean;
// import org.springframework.context.annotation.Configuration;
// import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
// import org.springframework.data.redis.core.StringRedisTemplate;
// import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
//
// /**
// * @author hongqiaowei
// */
//
// @Configuration
// @EnableRedisRepositories
// public class RedisConfiguration {
//
// @Bean
// public LettuceConnectionFactory redisConnectionFactory(
// RedisProperties redisProperties) {
// LettuceConnectionFactory cf = new LettuceConnectionFactory(
// redisProperties.getRedisHost(),
// redisProperties.getRedisPort());
// cf.setDatabase(redisProperties.getDatabase());
// return cf;
// }
//
// @Bean
// public StringRedisTemplate stringRedisTemplate(LettuceConnectionFactory connectionFactory) {
// StringRedisTemplate template = new StringRedisTemplate();
// template.setConnectionFactory(connectionFactory);
// return template;
// }
// }

58
src/test/java/we/redis/RedisProperties.java Normal file
View File

@@ -0,0 +1,58 @@
// package we.redis;
//
// import org.springframework.beans.factory.annotation.Value;
// import org.springframework.context.annotation.Configuration;
// import we.util.JacksonUtils;
//
// /**
// * @author hongqiaowei
// */
//
// @Configuration
// public class RedisProperties {
//
// private int redisPort;
// private String redisHost;
// private int database;
//
// public RedisProperties(
// /*@Value("${spring.redis.port}") int redisPort,
// @Value("${spring.redis.host}") String redisHost,
// @Value("${spring.redis.database}") int database*/) {
// // this.redisPort = redisPort;
// // this.redisHost = redisHost;
// // this.database = database;
// this.redisPort = 6379;
// this.redisHost = "localhost";
// this.database = 3;
// }
//
// public int getRedisPort() {
// return redisPort;
// }
//
// public void setRedisPort(int redisPort) {
// this.redisPort = redisPort;
// }
//
// public String getRedisHost() {
// return redisHost;
// }
//
// public void setRedisHost(String redisHost) {
// this.redisHost = redisHost;
// }
//
// public int getDatabase() {
// return database;
// }
//
// public void setDatabase(int database) {
// this.database = database;
// }
//
// @Override
// public String toString() {
// return JacksonUtils.writeValueAsString(this);
// }
// }

34
src/test/java/we/redis/RedisTestConfiguration.java Normal file
View File

@@ -0,0 +1,34 @@
// package we.redis;
//
// import org.springframework.context.annotation.Configuration;
// import redis.embedded.RedisServer;
//
// import javax.annotation.PostConstruct;
// import javax.annotation.PreDestroy;
//
// /**
// * @author hongqiaowei
// */
//
// @Configuration
// public class RedisTestConfiguration {
//
// private RedisServer redisServer;
//
// public RedisTestConfiguration(RedisProperties redisProperties) {
// redisServer = RedisServer.builder()
// .port(redisProperties.getRedisPort())
// .setting("maxmemory 32M")
// .build();
// }
//
// @PostConstruct
// public void postConstruct() {
// redisServer.start();
// }
//
// @PreDestroy
// public void preDestroy() {
// redisServer.stop();
// }
// }

75
src/test/java/we/stats/ratelimit/ResourceRateLimitConfigServiceTests.java
View File

@@ -1,17 +1,58 @@
package we.stats.ratelimit;
import org.junit.jupiter.api.Test;
/**
* @author hongqiaowei
*/
public class ResourceRateLimitConfigServiceTests {
@Test
void initTest() {
// 其实就是要构建个 context，里面有 redis、ReactiveStringRedisTemplate、ResourceRateLimitConfigService
// ResourceRateLimitConfigService 依赖 ReactiveStringRedisTemplate，然后能 PostConstruct
}
}
// package we.stats.ratelimit;
//
// import org.junit.jupiter.api.AfterAll;
// import org.junit.jupiter.api.BeforeAll;
// import org.junit.jupiter.api.Test;
// import org.springframework.boot.test.context.SpringBootTest;
// import org.springframework.context.annotation.PropertySource;
// import org.springframework.data.redis.core.StringRedisTemplate;
// import org.springframework.test.context.ActiveProfiles;
// import org.springframework.test.context.ContextConfiguration;
// import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
// import redis.embedded.RedisServer;
// import we.redis.RedisProperties;
// import we.redis.RedisTestConfiguration;
//
// import javax.annotation.Resource;
//
// /**
// * @author hongqiaowei
// */
//
// // @SpringBootTest(classes = RedisTestConfiguration.class)
// // @ContextConfiguration(classes = RedisTestConfiguration.class)
// @PropertySource("classpath:/application.yml")
// @SpringJUnitConfig(classes = {RedisProperties.class, RedisTestConfiguration.class, RedisTestConfiguration.class})
// // @ActiveProfiles("unittest")
// public class ResourceRateLimitConfigServiceTests {
//
// // private static RedisServer redisServer;
// //
// // @BeforeAll
// // static void startRedis() {
// // redisServer = RedisServer.builder()
// // .port(6379)
// // .setting("maxmemory 32M")
// // .build();
// // redisServer.start();
// // }
// //
// // @AfterAll
// // static void stopRedis() {
// // redisServer.stop();
// // }
//
// @Resource
// private RedisProperties redisProperties;
//
// @Resource
// private StringRedisTemplate stringRedisTemplate;
//
// @Test
// void initTest() {
// System.err.println("redis: " + redisProperties);
// System.err.println("stringRedisTemplate: " + stringRedisTemplate);
// // 其实就是要构建个 context，里面有 redis、ReactiveStringRedisTemplate、ResourceRateLimitConfigService
// // ResourceRateLimitConfigService 依赖 ReactiveStringRedisTemplate，然后能 PostConstruct
// }
// }

5
src/test/resources/application.yml Normal file
View File

@@ -0,0 +1,5 @@
#spring:
# redis:
# host: localhost
# port: 6379
# database: 3