zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ server ] [ executor ] - polish code -1

Browse Source
This commit is contained in:
IceDerce
2022-12-14 20:17:37 +08:00
parent d0bdca5ced
commit 3934bf17f8
12 changed files with 223 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
agent/src/main/java/io/wdd/agent/executor/redis/StreamSender.java
View File

@@ -13,6 +13,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.stream.MapRecord;
import org.springframework.data.redis.connection.stream.RecordId;
import org.springframework.data.redis.connection.stream.StreamRecords;
import org.springframework.data.redis.connection.stream.StringRecord;
import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource;
@@ -31,27 +32,41 @@ import java.util.concurrent.TimeUnit;
@Slf4j
public class StreamSender {
public static String TEST_STREAM_JAVA = "test-stream-java";
@Resource
RedisTemplate redisTemplate;
@Resource
LogToArrayListCache logToArrayListCache;
private final HashMap<String, StreamSenderEntity> AllNeededStreamSender = new HashMap<>(16);
private final ArrayList<String> cacheLogList = new ArrayList<>(256);
private static ByteBuffer currentTimeByteBuffer() {
private HashMap<String, StreamSenderEntity> AllNeededStreamSender = new HashMap<>(16);
byte[] timeBytes = LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).getBytes(StandardCharsets.UTF_8);
return ByteBuffer.wrap(timeBytes);
}
private ArrayList<String> cacheLogList = new ArrayList<>(256);
private static String currentTimeString() {
return LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
@SneakyThrows
private static Map generateFakeData() {
String random = RandomStringUtils.random(16);
CommandLog commandLog = new CommandLog();
Map<String, String> map = BeanUtils.describe(commandLog);
return map;
}
public void startToWaitLog(String streamKey) throws InterruptedException {
if (!AllNeededStreamSender.containsKey(streamKey)) {
StreamSenderEntity streamSender = StreamSenderEntity.builder()
.cachedCommandLog(logToArrayListCache.getCommandCachedLog(streamKey))
.waitToSendLog(true)
.startIndex(0)
.streamKey(streamKey).build();
StreamSenderEntity streamSender = StreamSenderEntity.builder().cachedCommandLog(logToArrayListCache.getCommandCachedLog(streamKey)).waitToSendLog(true).startIndex(0).streamKey(streamKey).build();
AllNeededStreamSender.put(streamKey, streamSender);
@@ -65,7 +80,7 @@ public class StreamSender {
}
}
public void endWaitLog(String streamKey){
public void endWaitLog(String streamKey) {
StreamSenderEntity streamSenderEntity = AllNeededStreamSender.get(streamKey);
streamSenderEntity.setWaitToSendLog(false);
@@ -95,52 +110,37 @@ public class StreamSender {
startIndex = endIndex;
}
public boolean send(String streamKey, String content){
public boolean send(String streamKey, String content) {
return this.send(streamKey, List.of(content));
HashMap<String, String> map = new HashMap<>(16);
map.put(currentTimeString(), content);
return doSendLogToStream(streamKey, map);
}
private boolean send(String streamKey, List<String> content) {
HashMap<String, List<String>> map = new HashMap<>(16);
return this.send(streamKey, content.toString());
map.put(currentTimeString(), content);
return doSendLogToStream(streamKey, map);
}
private static ByteBuffer currentTimeByteBuffer(){
byte[] timeBytes = LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).getBytes(StandardCharsets.UTF_8);
return ByteBuffer.wrap(timeBytes);
}
private static String currentTimeString(){
return LocalDateTime.now(ZoneId.of("UTC+8")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
}
private boolean doSendLogToStream(String streamKey, HashMap map) {
log.info("redis stream sender message is {}", map);
log.info("redis stream sender message is {}", map);
MapRecord<String, String, List<String>> stringRecord = StreamRecords.mapBacked(map).withStreamKey(streamKey);
StringRecord stringRecord = StreamRecords.string(map).withStreamKey(streamKey);
RecordId recordId = redisTemplate.opsForStream().add(stringRecord);
RecordId recordId = redisTemplate.opsForStream().add(stringRecord);
// log.info("redis send recordId is {}",recordId);
return ObjectUtils.isNotEmpty(recordId);
return ObjectUtils.isNotEmpty(recordId);
}
public static String TEST_STREAM_JAVA = "test-stream-java";
@SneakyThrows
public void test(){
public void test() {
RecordId recordId = null;
if (!redisTemplate.hasKey(TEST_STREAM_JAVA)) {
@@ -163,16 +163,6 @@ public class StreamSender {
}
@SneakyThrows
private static Map generateFakeData() {
String random = RandomStringUtils.random(16);
CommandLog commandLog = new CommandLog();
Map<String, String> map = BeanUtils.describe(commandLog);
return map;
}
public void clearLocalCache(String streamKey) {
AllNeededStreamSender.remove(streamKey);
}

3
agent/src/main/java/io/wdd/agent/executor/web/TestCommandExecutorController.java
View File

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@RestController
@@ -44,7 +45,7 @@ public class TestCommandExecutorController {
ExecutionMessage executionMessage = ExecutionMessage.builder()
.resultKey(streamKey)
.type(messageType)
.command(messageType)
.commandList(Collections.singletonList(messageType))
.build();
System.out.println("executionMessage = " + executionMessage);

7
agent/src/main/resources/application-k3s.yaml
View File

@@ -1,7 +0,0 @@
spring:
redis:
master

18
agent/src/main/resources/nginx-loadbalancer.conf Normal file
View File

@@ -0,0 +1,18 @@
upstream redis-cluster {
server 146.56.147.12:21370;
server 146.56.147.12:21371;
server 146.56.147.12:21372;
server 146.56.147.12:21373;
server 146.56.147.12:21374;
server 146.56.147.12:21375;
}
server {
listen 26379;
proxy_pass redis-cluster;
}
server {
listen 6379;
proxy_pass 10.74.68.146:6379;
}

6
agent/src/test/java/io/wdd/agent/AgentApplicationTests.java
View File

@@ -19,7 +19,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
@SpringBootTest
//@SpringBootTest
@Slf4j
class AgentApplicationTests {
@@ -30,7 +30,7 @@ class AgentApplicationTests {
CollectAllExecutorFunction collectAllExecutorFunction;
@Test
// @Test
void testFileExecute(){
// ExecutionMessage executionMessage = ExecutionMessage.builder().type("TestFunction").resultKey("simpleFor-test").contend("123456").build();
@@ -42,7 +42,7 @@ class AgentApplicationTests {
}
@Test
// @Test
void contextLoads() {
// https://zhuanlan.zhihu.com/p/449416472