From 06d20229c48d3a0374927d65416427e0164592ef Mon Sep 17 00:00:00 2001 From: hailong15 Date: Thu, 27 Nov 2025 13:00:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?dns=E6=9F=A5=E8=AF=A2=E5=87=BA=E9=94=99?= =?UTF-8?q?=E5=90=8E=E7=BB=A7=E7=BB=AD=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/private_key.pem | 10 ++++++++++ discovery/src/dns/lookup.rs | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/private_key.pem diff --git a/.github/workflows/private_key.pem b/.github/workflows/private_key.pem new file mode 100644 index 000000000..9b794eabd --- /dev/null +++ b/.github/workflows/private_key.pem @@ -0,0 +1,10 @@ +-----BEGIN PRIVATE KEY----- +MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEA0RuIiBEhPUhVjYyZ +Ng9IRFzjbSMNUIjaGhUwHIbVQS2jkdPcgkmdImKwmBv+6Pw0l0Fs5p4wZTlspaBN +5HwuXQIDAQABAkAG7u/G+zJr8sMLb3cBCN6vjZjo3Hmriu4YYU14FKxrfcWGTzc4 +F2jiP+MTcNDR8NL171rvW8oWK/ciGJ1GOe4tAiEA+AbpONDM5DstShHzaa8bjzix +lUENOIp/TIH6+zatjysCIQDX1FerMmocfggfkGu0HvDqUPoBCBZk1S8TDh3MZRg0 +lwIgXMFQ5POJPG05EbNG4aYf217rYpLyW8vHsZgGgX5ASAMCIDIo0GMiKVUL2Vl0 +mANZeYYLYb7hoUq33OPh0P0StahrAiEAsJ5IjnPpCTfeV42AATwoYvOhM2NcSV/e +2UPKPXGV3bA= +-----END PRIVATE KEY----- diff --git a/discovery/src/dns/lookup.rs b/discovery/src/dns/lookup.rs index 2c2adbab1..9c6d752ba 100644 --- a/discovery/src/dns/lookup.rs +++ b/discovery/src/dns/lookup.rs @@ -1,7 +1,7 @@ use super::{Ipv4Vec, Record}; pub(super) struct Lookup {} -use dns_lookup::{getaddrinfo, AddrInfoHints}; +use dns_lookup::{AddrInfoHints, getaddrinfo}; use libc::SOCK_STREAM; use std::net::IpAddr; @@ -37,7 +37,7 @@ impl Lookup { let ret = self.dns_lookup(host); if ret.is_err() { log::error!("Failed to lookup ip for {} err:{:?}", host, ret.err()); - break; + continue; } let ips = ret.unwrap(); if r.refresh(ips) { From 4346204593178c86d4440fbc9d94b2f4773ce165 Mon Sep 17 00:00:00 2001 From: hailong15 Date: Thu, 27 Nov 2025 15:41:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9A=B4=E9=9C=B2=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/rust.yml | 94 ++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e6eb7294e..a8410a56d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -31,7 +31,39 @@ jobs: docker run --rm --name breeze_ci_mysql4623 -p 4623:3306 -d parabala/mysqlci_with_schema:v0.0.2 docker run --rm --name breeze_ci_mysql4624 -p 4624:3306 -d parabala/mysqlci_with_schema:v0.0.2 - name: Prepare Vintage_MC_Redis - run: docker run -d -v /home/runner/work/breeze:/data1/resource/breeze --net="host" --name breeze_github_ci hustfisher/breeze:githubci115 + run: | + docker run -d \ + -v /home/runner/work/breeze:/data1/resource/breeze \ + -p 8080:8080 \ + -p 13739:13739 \ + -p 13740:13740 \ + -p 13741:13741 \ + -p 13742:13742 \ + -p 56378:56378 \ + -p 56379:56379 \ + -p 56380:56380 \ + -p 56381:56381 \ + -p 56382:56382 \ + -p 56383:56383 \ + -p 56384:56384 \ + -p 56385:56385 \ + -p 56386:56386 \ + -p 56387:56387 \ + -p 56388:56388 \ + -p 56389:56389 \ + -p 56390:56390 \ + -p 56391:56391 \ + -p 56392:56392 \ + -p 56393:56393 \ + -p 8010:8010 \ + -p 8011:8011 \ + -p 8012:8012 \ + -p 8013:8013 \ + -p 8775:8775 \ + -p 8776:8776 \ + -p 8777:8777 \ + -p 8778:8778 \ + --name breeze_github_ci hustfisher/breeze:githubci115 - uses: actions/checkout@v3 - name: Install stable toolchain uses: actions-rs/toolchain@v1 @@ -82,9 +114,7 @@ jobs: ls -all /home/runner/work/breeze/socks ls -all /home/runner/work/breeze/logs tail -10 /home/runner/work/breeze/logs/log.file - tail -10 /home/runner/work/breeze/logs/breeze.log #cat /home/runner/work/breeze/logs/log.file - #cat /home/runner/work/breeze/logs/breeze.log #- name: Run cargo-tarpaulin # uses: actions-rs/tarpaulin@v0.1 # with: @@ -92,37 +122,41 @@ jobs: # args: "--features=github_workflow --features=console-api -- --test-threads 1" - name: Run unit tests run: cargo test -p tests --features github_workflow -p endpoint - - name: wait until 2 mins - run: | - port_list=(56810 56812 9302 9301 9303 3306 3308) # 端口列表 - start=$(date +%s) # 获取当前时间戳 + # - name: wait until 2 mins + # run: | + # port_list=(56810 56812 9302 9301 9303 3306 3308) # 端口列表 + # start=$(date +%s) # 获取当前时间戳 - while true; do - now=$(date +%s) # 获取当前时间戳 - diff=$((now - start)) # 计算时间差 - if [ $diff -lt 120 ]; then # 如果时间差小于120秒 - all_listened=true - for port in "${port_list[@]}"; do - if ! netstat -an | grep -q ":$port.*LISTEN"; then - echo "Port $port is not being listened to. Sleeping for 5 seconds..." - all_listened=false - sleep 5 # 等待5秒 - break - fi - done - if $all_listened; then - echo "All ports are being listened to. Exiting loop." - break # 退出循环 - fi - else - echo "Two minutes have passed. Exiting loop." - break # 退出循环 - fi - done + # while true; do + # now=$(date +%s) # 获取当前时间戳 + # diff=$((now - start)) # 计算时间差 + # if [ $diff -lt 120 ]; then # 如果时间差小于120秒 + # all_listened=true + # for port in "${port_list[@]}"; do + # if ! netstat -an | grep -q ":$port.*LISTEN"; then + # echo "Port $port is not being listened to. Sleeping for 5 seconds..." + # all_listened=false + # sleep 5 # 等待5秒 + # break + # fi + # done + # if $all_listened; then + # echo "All ports are being listened to. Exiting loop." + # break # 退出循环 + # fi + # else + # echo "Two minutes have passed. Exiting loop." + # break # 退出循环 + # fi + # done - name: Run ci tests run: cargo test -p tests_integration --features github_workflow - name: Output log if: failure() run: | cat /home/runner/work/breeze/logs/log.file - cat /home/runner/work/breeze/logs/breeze.log + docker logs breeze_github_ci + - name: Output docker log + if: failure() + run: | + docker logs breeze_github_ci \ No newline at end of file From b8c52b67c3a2a82f8f23e276080e15e9fbb5900e Mon Sep 17 00:00:00 2001 From: hailong15 Date: Fri, 28 Nov 2025 18:35:54 +0800 Subject: [PATCH 3/4] ci_image --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a8410a56d..361ca3fe3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -63,7 +63,7 @@ jobs: -p 8776:8776 \ -p 8777:8777 \ -p 8778:8778 \ - --name breeze_github_ci hustfisher/breeze:githubci115 + --name breeze_github_ci viciousstar/breeze:githubci117 - uses: actions/checkout@v3 - name: Install stable toolchain uses: actions-rs/toolchain@v1 From d13c674538f3104ae7d48b8aeb3700af87da2557 Mon Sep 17 00:00:00 2001 From: hailong15 Date: Mon, 1 Dec 2025 15:20:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=AC=E5=9C=B0ci?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/rust.yml | 68 +++++++++++++++++--------------------- ci.sh | 39 ++++++++++++++++++++-- 2 files changed, 66 insertions(+), 41 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 361ca3fe3..7d5337320 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -63,7 +63,7 @@ jobs: -p 8776:8776 \ -p 8777:8777 \ -p 8778:8778 \ - --name breeze_github_ci viciousstar/breeze:githubci117 + --name breeze_github_ci viciousstar/breeze:githubci120 - uses: actions/checkout@v3 - name: Install stable toolchain uses: actions-rs/toolchain@v1 @@ -74,7 +74,6 @@ jobs: run: cargo build - name: Check Vintage run: | - docker ps -a curl http://127.0.0.1:8080/config/cloud/redis/testbreeze/redismeshtest curl http://127.0.0.1:8080/config/v1/cache.service.testbreeze.pool.yf/all sleep 1 @@ -108,54 +107,47 @@ jobs: - name: Check Status run: | sleep 6s - netstat -nat|grep LISTEN - #ps -aux|grep breeze + docker ps -a + docker inspect breeze_github_ci + netstat -natp|grep LISTEN ls -all /home/runner/work/breeze/snapshot ls -all /home/runner/work/breeze/socks ls -all /home/runner/work/breeze/logs - tail -10 /home/runner/work/breeze/logs/log.file - #cat /home/runner/work/breeze/logs/log.file - #- name: Run cargo-tarpaulin - # uses: actions-rs/tarpaulin@v0.1 - # with: - # version: "0.22.0" - # args: "--features=github_workflow --features=console-api -- --test-threads 1" - name: Run unit tests run: cargo test -p tests --features github_workflow -p endpoint - # - name: wait until 2 mins - # run: | - # port_list=(56810 56812 9302 9301 9303 3306 3308) # 端口列表 - # start=$(date +%s) # 获取当前时间戳 + - name: wait until 2 mins + run: | + port_list=(56810 56812 9302 9301 9303 3306 3308) # 端口列表 + start=$(date +%s) # 获取当前时间戳 - # while true; do - # now=$(date +%s) # 获取当前时间戳 - # diff=$((now - start)) # 计算时间差 - # if [ $diff -lt 120 ]; then # 如果时间差小于120秒 - # all_listened=true - # for port in "${port_list[@]}"; do - # if ! netstat -an | grep -q ":$port.*LISTEN"; then - # echo "Port $port is not being listened to. Sleeping for 5 seconds..." - # all_listened=false - # sleep 5 # 等待5秒 - # break - # fi - # done - # if $all_listened; then - # echo "All ports are being listened to. Exiting loop." - # break # 退出循环 - # fi - # else - # echo "Two minutes have passed. Exiting loop." - # break # 退出循环 - # fi - # done + while true; do + now=$(date +%s) # 获取当前时间戳 + diff=$((now - start)) # 计算时间差 + if [ $diff -lt 120 ]; then # 如果时间差小于120秒 + all_listened=true + for port in "${port_list[@]}"; do + if ! netstat -an | grep -q ":$port.*LISTEN"; then + echo "Port $port is not being listened to. Sleeping for 5 seconds..." + all_listened=false + sleep 5 # 等待5秒 + break + fi + done + if $all_listened; then + echo "All ports are being listened to. Exiting loop." + break # 退出循环 + fi + else + echo "Two minutes have passed. Exiting loop." + break # 退出循环 + fi + done - name: Run ci tests run: cargo test -p tests_integration --features github_workflow - name: Output log if: failure() run: | cat /home/runner/work/breeze/logs/log.file - docker logs breeze_github_ci - name: Output docker log if: failure() run: | diff --git a/ci.sh b/ci.sh index ab214f8b4..2c3440a36 100755 --- a/ci.sh +++ b/ci.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash brz_home="/data1/ci/breeze" mkdir -p $brz_home @@ -11,7 +11,39 @@ container_name=breeze_github_ci docker ps -a | grep "$container_name" && docker rm -f "$container_name" -docker run --rm -d -v $brz_home:/data1/resource/breeze --net="host" --name "$container_name" parabala/breeze:githubci108 +docker run --rm -d \ + -v "$brz_home":/data1/resource/breeze \ + -p 8080:8080 \ + -p 13739:13739 \ + -p 13740:13740 \ + -p 13741:13741 \ + -p 13742:13742 \ + -p 56378:56378 \ + -p 56379:56379 \ + -p 56380:56380 \ + -p 56381:56381 \ + -p 56382:56382 \ + -p 56383:56383 \ + -p 56384:56384 \ + -p 56385:56385 \ + -p 56386:56386 \ + -p 56387:56387 \ + -p 56388:56388 \ + -p 56389:56389 \ + -p 56390:56390 \ + -p 56391:56391 \ + -p 56392:56392 \ + -p 56393:56393 \ + -p 8010:8010 \ + -p 8011:8011 \ + -p 8012:8012 \ + -p 8013:8013 \ + -p 8775:8775 \ + -p 8776:8776 \ + -p 8777:8777 \ + -p 8778:8778 \ + --name "$container_name" \ + viciousstar/breeze:githubci120 # rm -rf $brz_home/* mkdir -p $brz_home/logs @@ -24,7 +56,7 @@ touch $brz_home/socks/127.0.0.1:8080+config+cloud+counterservice+testbreeze+mesh touch $brz_home/socks/127.0.0.1:8080+config+cloud+phantom+testbreeze+phantomtest@phantom:9303@pt touch $brz_home/socks/127.0.0.1:8080+config+cloud+kv+testbreeze+kvmeshtest@kv:3306@kv touch $brz_home/socks/127.0.0.1:8080+config+cloud+vector+testbreeze+vectortest@vector:3308@vector - +touch $brz_home/socks/127.0.0.1:8080+config+cloud+mq+testbreeze+mcqmeshtest_1@msgque:56815@mq cargo build nohup ./target/debug/agent --discovery vintage://127.0.0.1:8080 --snapshot $brz_home/snapshot --service-path $brz_home/socks --log-dir $brz_home/logs --port 9984 --metrics-probe 8.8.8.8:53 --log-level info --idc-path 127.0.0.1:8080/3/config/breeze/idc_region --key-path .github/workflows/private_key.pem > $brz_home/logs/log.file 2>&1 & @@ -38,6 +70,7 @@ export mc=localhost:9301 export phantom=localhost:9303 export mysql=localhost:3306 export vector=localhost:3308 +export mq=localhost:56815 export min_key=1 export max_key=10000 export socks_dir=$brz_home/socks