Skip to content

Commit 38939f8

Browse files
viciousstarviciousstar
authored
Merge pull request #508 from weibocom/fixdns
dns查询出错后继续查询
2 parents 4de4ced + d13c674 commit 38939f8

File tree

4 files changed

+88
-19
lines changed

4 files changed

+88
-19
lines changed

‎.github/workflows/private_key.pem‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
-----BEGIN PRIVATE KEY-----
2+
MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEA0RuIiBEhPUhVjYyZ
3+
Ng9IRFzjbSMNUIjaGhUwHIbVQS2jkdPcgkmdImKwmBv+6Pw0l0Fs5p4wZTlspaBN
4+
5HwuXQIDAQABAkAG7u/G+zJr8sMLb3cBCN6vjZjo3Hmriu4YYU14FKxrfcWGTzc4
5+
F2jiP+MTcNDR8NL171rvW8oWK/ciGJ1GOe4tAiEA+AbpONDM5DstShHzaa8bjzix
6+
lUENOIp/TIH6+zatjysCIQDX1FerMmocfggfkGu0HvDqUPoBCBZk1S8TDh3MZRg0
7+
lwIgXMFQ5POJPG05EbNG4aYf217rYpLyW8vHsZgGgX5ASAMCIDIo0GMiKVUL2Vl0
8+
mANZeYYLYb7hoUq33OPh0P0StahrAiEAsJ5IjnPpCTfeV42AATwoYvOhM2NcSV/e
9+
2UPKPXGV3bA=
10+
-----END PRIVATE KEY-----

‎.github/workflows/rust.yml‎

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,39 @@ jobs:
3131
docker run --rm --name breeze_ci_mysql4623 -p 4623:3306 -d parabala/mysqlci_with_schema:v0.0.2
3232
docker run --rm --name breeze_ci_mysql4624 -p 4624:3306 -d parabala/mysqlci_with_schema:v0.0.2
3333
- name: Prepare Vintage_MC_Redis
34-
run: docker run -d -v /home/runner/work/breeze:/data1/resource/breeze --net="host" --name breeze_github_ci hustfisher/breeze:githubci115
34+
run: |
35+
docker run -d \
36+
-v /home/runner/work/breeze:/data1/resource/breeze \
37+
-p 8080:8080 \
38+
-p 13739:13739 \
39+
-p 13740:13740 \
40+
-p 13741:13741 \
41+
-p 13742:13742 \
42+
-p 56378:56378 \
43+
-p 56379:56379 \
44+
-p 56380:56380 \
45+
-p 56381:56381 \
46+
-p 56382:56382 \
47+
-p 56383:56383 \
48+
-p 56384:56384 \
49+
-p 56385:56385 \
50+
-p 56386:56386 \
51+
-p 56387:56387 \
52+
-p 56388:56388 \
53+
-p 56389:56389 \
54+
-p 56390:56390 \
55+
-p 56391:56391 \
56+
-p 56392:56392 \
57+
-p 56393:56393 \
58+
-p 8010:8010 \
59+
-p 8011:8011 \
60+
-p 8012:8012 \
61+
-p 8013:8013 \
62+
-p 8775:8775 \
63+
-p 8776:8776 \
64+
-p 8777:8777 \
65+
-p 8778:8778 \
66+
--name breeze_github_ci viciousstar/breeze:githubci120
3567
- uses: actions/checkout@v3
3668
- name: Install stable toolchain
3769
uses: actions-rs/toolchain@v1
@@ -42,7 +74,6 @@ jobs:
4274
run: cargo build
4375
- name: Check Vintage
4476
run: |
45-
docker ps -a
4677
curl http://127.0.0.1:8080/config/cloud/redis/testbreeze/redismeshtest
4778
curl http://127.0.0.1:8080/config/v1/cache.service.testbreeze.pool.yf/all
4879
sleep 1
@@ -76,20 +107,12 @@ jobs:
76107
- name: Check Status
77108
run: |
78109
sleep 6s
79-
netstat -nat|grep LISTEN
80-
#ps -aux|grep breeze
110+
docker ps -a
111+
docker inspect breeze_github_ci
112+
netstat -natp|grep LISTEN
81113
ls -all /home/runner/work/breeze/snapshot
82114
ls -all /home/runner/work/breeze/socks
83115
ls -all /home/runner/work/breeze/logs
84-
tail -10 /home/runner/work/breeze/logs/log.file
85-
tail -10 /home/runner/work/breeze/logs/breeze.log
86-
#cat /home/runner/work/breeze/logs/log.file
87-
#cat /home/runner/work/breeze/logs/breeze.log
88-
#- name: Run cargo-tarpaulin
89-
# uses: actions-rs/tarpaulin@v0.1
90-
# with:
91-
# version: "0.22.0"
92-
# args: "--features=github_workflow --features=console-api -- --test-threads 1"
93116
- name: Run unit tests
94117
run: cargo test -p tests --features github_workflow -p endpoint
95118
- name: wait until 2 mins
@@ -125,4 +148,7 @@ jobs:
125148
if: failure()
126149
run: |
127150
cat /home/runner/work/breeze/logs/log.file
128-
cat /home/runner/work/breeze/logs/breeze.log
151+
- name: Output docker log
152+
if: failure()
153+
run: |
154+
docker logs breeze_github_ci

‎ci.sh‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
brz_home="/data1/ci/breeze"
33
mkdir -p $brz_home
44

@@ -11,7 +11,39 @@ container_name=breeze_github_ci
1111
docker ps -a | grep "$container_name" && docker rm -f "$container_name"
1212

1313

14-
docker run --rm -d -v $brz_home:/data1/resource/breeze --net="host" --name "$container_name" parabala/breeze:githubci108
14+
docker run --rm -d \
15+
-v "$brz_home":/data1/resource/breeze \
16+
-p 8080:8080 \
17+
-p 13739:13739 \
18+
-p 13740:13740 \
19+
-p 13741:13741 \
20+
-p 13742:13742 \
21+
-p 56378:56378 \
22+
-p 56379:56379 \
23+
-p 56380:56380 \
24+
-p 56381:56381 \
25+
-p 56382:56382 \
26+
-p 56383:56383 \
27+
-p 56384:56384 \
28+
-p 56385:56385 \
29+
-p 56386:56386 \
30+
-p 56387:56387 \
31+
-p 56388:56388 \
32+
-p 56389:56389 \
33+
-p 56390:56390 \
34+
-p 56391:56391 \
35+
-p 56392:56392 \
36+
-p 56393:56393 \
37+
-p 8010:8010 \
38+
-p 8011:8011 \
39+
-p 8012:8012 \
40+
-p 8013:8013 \
41+
-p 8775:8775 \
42+
-p 8776:8776 \
43+
-p 8777:8777 \
44+
-p 8778:8778 \
45+
--name "$container_name" \
46+
viciousstar/breeze:githubci120
1547

1648
# rm -rf $brz_home/*
1749
mkdir -p $brz_home/logs
@@ -24,7 +56,7 @@ touch $brz_home/socks/127.0.0.1:8080+config+cloud+counterservice+testbreeze+mesh
2456
touch $brz_home/socks/127.0.0.1:8080+config+cloud+phantom+testbreeze+phantomtest@phantom:9303@pt
2557
touch $brz_home/socks/127.0.0.1:8080+config+cloud+kv+testbreeze+kvmeshtest@kv:3306@kv
2658
touch $brz_home/socks/127.0.0.1:8080+config+cloud+vector+testbreeze+vectortest@vector:3308@vector
27-
59+
touch $brz_home/socks/127.0.0.1:8080+config+cloud+mq+testbreeze+mcqmeshtest_1@msgque:56815@mq
2860

2961
cargo build
3062
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
3870
export phantom=localhost:9303
3971
export mysql=localhost:3306
4072
export vector=localhost:3308
73+
export mq=localhost:56815
4174
export min_key=1
4275
export max_key=10000
4376
export socks_dir=$brz_home/socks

‎discovery/src/dns/lookup.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::{Ipv4Vec, Record};
22
pub(super) struct Lookup {}
33

4-
use dns_lookup::{getaddrinfo, AddrInfoHints};
4+
use dns_lookup::{AddrInfoHints, getaddrinfo};
55
use libc::SOCK_STREAM;
66

77
use std::net::IpAddr;
@@ -37,7 +37,7 @@ impl Lookup {
3737
let ret = self.dns_lookup(host);
3838
if ret.is_err() {
3939
log::error!("Failed to lookup ip for {} err:{:?}", host, ret.err());
40-
break;
40+
continue;
4141
}
4242
let ips = ret.unwrap();
4343
if r.refresh(ips) {

0 commit comments

Comments
 (0)
⚡