Merge branch 'openmsource_v1.2_20240306' into main

vivo · Mar 19, 2024 · d0c0cd9 · d0c0cd9
2 parents 7f0dba1 + 07d7239
commit d0c0cd9
Show file tree

Hide file tree

Showing 45 changed files with 1,936 additions and 15 deletions.
diff --git a/docker/docker-compose-arm64.yml b/docker/docker-compose-arm64.yml
@@ -16,6 +16,82 @@
 version: "3"
 
 services:
+  redis-cluster:
+    image: redis
+    command: redis-cli --cluster create 172.22.225.9:6371 172.22.225.9:6372 172.22.225.9:6373 172.22.225.9:6374 172.22.225.9:6375 172.22.225.9:6376 --cluster-replicas 1  --cluster-yes
+    depends_on:
+      - redis-6371
+      - redis-6372
+      - redis-6373
+      - redis-6374
+      - redis-6375
+      - redis-6376
+  redis-6371: # 服务名称
+    image: redis # 创建容器时所需的镜像
+    container_name: redis-6371 # 容器名称
+    restart: always # 容器总是重新启动
+    ports:
+      - "6371:6371"
+      - "16371:16371"
+    volumes: # 数据卷，目录挂载
+      - ./redis/redis1/redis1.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis1/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf # 覆盖容器启动后默认执行的命令
+
+  redis-6372:
+    image: redis
+    container_name: redis-6372
+    ports:
+      - "6372:6372"
+      - "16372:16372"
+    volumes:
+      - ./redis/redis2/redis2.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis2/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6373:
+    image: redis
+    container_name: redis-6373
+    ports:
+      - "6373:6373"
+      - "16373:16373"
+    volumes:
+      - ./redis/redis3/redis3.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis3/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6374:
+    image: redis
+    container_name: redis-6374
+    ports:
+      - "6374:6374"
+      - "16374:16374"
+    volumes:
+      - ./redis/redis4/redis4.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis4/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6375:
+    image: redis
+    container_name: redis-6375
+    ports:
+      - "6375:6375"
+      - "16375:16375"
+    volumes:
+      - ./redis/redis5/redis5.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis5/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6376:
+    image: redis
+    container_name: redis-6376
+    ports:
+      - "6376:6376"
+      - "16376:16376"
+    volumes:
+      - ./redis/redis6/redis6.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis6/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
   moonbox-mysql:
     platform: linux/amd64
     container_name: moonbox-mysql

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -16,6 +16,82 @@
 version: "3"
 
 services:
+  redis-cluster:
+    image: redis
+    command: redis-cli --cluster create 172.22.225.9:6371 172.22.225.9:6372 172.22.225.9:6373 172.22.225.9:6374 172.22.225.9:6375 172.22.225.9:6376 --cluster-replicas 1  --cluster-yes
+    depends_on:
+      - redis-6371
+      - redis-6372
+      - redis-6373
+      - redis-6374
+      - redis-6375
+      - redis-6376
+  redis-6371: # 服务名称
+    image: redis # 创建容器时所需的镜像
+    container_name: redis-6371 # 容器名称
+    restart: always # 容器总是重新启动
+    ports:
+      - "6371:6371"
+      - "16371:16371"
+    volumes: # 数据卷，目录挂载
+      - ./redis/redis1/redis1.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis1/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf # 覆盖容器启动后默认执行的命令
+
+  redis-6372:
+    image: redis
+    container_name: redis-6372
+    ports:
+      - "6372:6372"
+      - "16372:16372"
+    volumes:
+      - ./redis/redis2/redis2.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis2/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6373:
+    image: redis
+    container_name: redis-6373
+    ports:
+      - "6373:6373"
+      - "16373:16373"
+    volumes:
+      - ./redis/redis3/redis3.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis3/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6374:
+    image: redis
+    container_name: redis-6374
+    ports:
+      - "6374:6374"
+      - "16374:16374"
+    volumes:
+      - ./redis/redis4/redis4.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis4/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6375:
+    image: redis
+    container_name: redis-6375
+    ports:
+      - "6375:6375"
+      - "16375:16375"
+    volumes:
+      - ./redis/redis5/redis5.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis5/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
+
+  redis-6376:
+    image: redis
+    container_name: redis-6376
+    ports:
+      - "6376:6376"
+      - "16376:16376"
+    volumes:
+      - ./redis/redis6/redis6.conf:/usr/local/etc/redis/redis.conf
+      - ./redis/redis6/data:/data
+    command: redis-server /usr/local/etc/redis/redis.conf
   moonbox-mysql:
     container_name: moonbox-mysql
     build: 

diff --git a/docker/redis/redis1/data/nodes.conf b/docker/redis/redis1/data/nodes.conf
@@ -0,0 +1,4 @@
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f master - 0 1709196638000 2 connected 5461-10922
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d myself,master - 0 1709196638000 1 connected 0-5460
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6373@16373,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 master - 1709196638126 1709196638030 6 disconnected 10923-16383
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis1/redis1.conf b/docker/redis/redis1/redis1.conf
@@ -0,0 +1,10 @@
+port 6371
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6371
+cluster-announce-bus-port 16371
diff --git a/docker/redis/redis2/data/nodes.conf b/docker/redis/redis2/data/nodes.conf
@@ -0,0 +1,4 @@
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6373@16373,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 master - 1709196637740 1709196637645 6 disconnected 10923-16383
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f myself,master - 0 1709196638000 2 connected 5461-10922
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d master - 0 1709196638146 1 connected 0-5460
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis2/redis2.conf b/docker/redis/redis2/redis2.conf
@@ -0,0 +1,10 @@
+port 6372
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6372
+cluster-announce-bus-port 16372
diff --git a/docker/redis/redis3/data/nodes.conf b/docker/redis/redis3/data/nodes.conf
@@ -0,0 +1,4 @@
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d master - 0 1709196411483 1 connected 0-5460
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6373@16373,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 myself,master - 0 1709196402000 3 connected 10923-16383
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f master - 1709196403317 1709196402321 2 connected 5461-10922
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis3/redis3.conf b/docker/redis/redis3/redis3.conf
@@ -0,0 +1,10 @@
+port 6373
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6373
+cluster-announce-bus-port 16373
diff --git a/docker/redis/redis4/data/nodes.conf b/docker/redis/redis4/data/nodes.conf
@@ -0,0 +1,4 @@
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f master - 0 1709196486419 2 connected 5461-10922
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6374@16374,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 myself,master - 0 1709196486000 4 connected
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d master - 1709196486410 1709196486324 1 connected 0-5460
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis4/redis4.conf b/docker/redis/redis4/redis4.conf
@@ -0,0 +1,10 @@
+port 6374
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6374
+cluster-announce-bus-port 16374
diff --git a/docker/redis/redis5/data/nodes.conf b/docker/redis/redis5/data/nodes.conf
@@ -0,0 +1,4 @@
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f master - 0 1709196516484 2 connected 5461-10922
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d master - 1709196516477 1709196516385 1 connected 0-5460
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6375@16375,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 myself,master - 0 1709196516000 5 connected
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis5/redis5.conf b/docker/redis/redis5/redis5.conf
@@ -0,0 +1,10 @@
+port 6375
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6375
+cluster-announce-bus-port 16375
diff --git a/docker/redis/redis6/data/nodes.conf b/docker/redis/redis6/data/nodes.conf
@@ -0,0 +1,4 @@
+2c71ee68db63234165e93d1619ff02a1641eb2f8 172.22.225.9:6372@16372,,tls-port=0,shard-id=a4b1bdfa0c58a6fbcd97d8a843d46286dc365e8f master - 0 1709196437505 2 connected 5461-10922
+e8fcf70df6cfd3838303d18d8e88f20f372120eb 172.22.225.9:6376@16376,,tls-port=0,shard-id=0e55c09c228fd825377ca07f972e371d7e2e5913 myself,master - 0 1709196437000 6 connected
+3926e4b60debec1282741e15953a74a6c4d3eb2a 172.22.225.9:6371@16371,,tls-port=0,shard-id=dad52cafaa52b017aedb5bedc18b1dbc459ff13d master - 0 1709196437504 1 connected 0-5460
+vars currentEpoch 6 lastVoteEpoch 0
diff --git a/docker/redis/redis6/redis6.conf b/docker/redis/redis6/redis6.conf
@@ -0,0 +1,10 @@
+port 6376
+protected-mode no
+daemonize no
+appendonly yes
+cluster-enabled yes
+cluster-config-file nodes.conf
+cluster-node-timeout 15000
+cluster-announce-ip 172.22.225.9
+cluster-announce-port 6376
+cluster-announce-bus-port 16376
diff --git a/local-agent/monbox-agent.tar b/local-agent/monbox-agent.tar
diff --git a/moonbox-agent/moonbox-java-agent/moonbox-core/pom.xml b/moonbox-agent/moonbox-java-agent/moonbox-core/pom.xml
@@ -17,6 +17,11 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.14</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/moonbox-agent/moonbox-java-agent/moonbox-plugins/moonbox/hbase-plugin/pom.xml b/moonbox-agent/moonbox-java-agent/moonbox-plugins/moonbox/hbase-plugin/pom.xml
@@ -0,0 +1,44 @@
+<?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"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>repeater-plugins</artifactId>
+        <groupId>com.vivo.jvm.sandbox</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.24</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>hbase-plugin</artifactId>
+
+    <build>
+        <finalName>${project.name}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>attached</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>