Skip to content

Commit 6de01de

Browse files
inelpandzicinelpandzic
authored
Merge branch 'main' into PCSM-223
2 parents 20b9738 + 6fec171 commit 6de01de

File tree

17 files changed

+328
-130
lines changed

17 files changed

+328
-130
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ on:
1919
paths-ignore:
2020
- "tests/**"
2121
- "packaging/**"
22+
23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: true
26+
2227
jobs:
2328
test:
2429
if: github.event.pull_request.draft == false
@@ -28,6 +33,7 @@ jobs:
2833
fail-fast: false
2934
matrix:
3035
psmdb: ["6.0", "7.0", "8.0"]
36+
shard: [0, 1, 2, 3, 4]
3137
env:
3238
PCSM_BRANCH: ${{ github.event_name == 'pull_request' && github.head_ref || github.event.inputs.pcsm_branch || 'main' }}
3339
steps:
@@ -45,9 +51,9 @@ jobs:
4551
docker compose up -d
4652
working-directory: psmdb-testing/pcsm-pytest
4753

48-
- name: Test ${{ matrix.test }} sync on PSMDB ${{ matrix.psmdb }} and PCSM PR/branch ${{ github.head_ref || github.event.inputs.pcsm_branch || env.PCSM_BRANCH }}
54+
- name: Run pytest shard ${{ matrix.shard }} on PSMDB ${{ matrix.psmdb }} and PCSM PR/branch ${{ github.head_ref || github.event.inputs.pcsm_branch || env.PCSM_BRANCH }}
4955
run: |
50-
docker compose run --rm test pytest -s --junitxml=junit.xml
56+
docker compose run --rm test pytest -s -v --junitxml=junit.xml --shard-id=${{ matrix.shard }} --num-shards=5 -m 'not jenkins'
5157
working-directory: psmdb-testing/pcsm-pytest
5258

5359
- name: Publish Test Report

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/percona/percona-clustersync-mongodb
22

3-
go 1.24
3+
go 1.24.0
44

55
require (
66
github.com/dustin/go-humanize v1.0.1
@@ -10,7 +10,7 @@ require (
1010
github.com/spf13/pflag v1.0.6
1111
github.com/stretchr/testify v1.10.0
1212
go.mongodb.org/mongo-driver/v2 v2.2.1
13-
golang.org/x/sync v0.14.0
13+
golang.org/x/sync v0.18.0
1414
)
1515

1616
require (
@@ -32,9 +32,9 @@ require (
3232
github.com/xdg-go/scram v1.1.2 // indirect
3333
github.com/xdg-go/stringprep v1.0.4 // indirect
3434
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
35-
golang.org/x/crypto v0.35.0 // indirect
36-
golang.org/x/sys v0.30.0 // indirect
37-
golang.org/x/text v0.22.0 // indirect
35+
golang.org/x/crypto v0.45.0 // indirect
36+
golang.org/x/sys v0.38.0 // indirect
37+
golang.org/x/text v0.31.0 // indirect
3838
google.golang.org/protobuf v1.36.5 // indirect
3939
gopkg.in/yaml.v3 v3.0.1 // indirect
4040
)

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ go.mongodb.org/mongo-driver/v2 v2.2.1 h1:w5xra3yyu/sGrziMzK1D0cRRaH/b7lWCSsoN6+W
6767
go.mongodb.org/mongo-driver/v2 v2.2.1/go.mod h1:qQkDMhCGWl3FN509DfdPd4GRBLU/41zqF/k8eTRceps=
6868
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6969
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
70-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
71-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
70+
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
71+
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
7272
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
7373
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
7474
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
7575
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
7676
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
7777
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
78-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
79-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
78+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
79+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
8080
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
8181
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
8282
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -85,16 +85,16 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
8585
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8686
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
8787
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
88-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
89-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
88+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
89+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
9090
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
9191
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
9292
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
9393
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
9494
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
9595
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
96-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
97-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
96+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
97+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
9898
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
9999
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
100100
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

‎hack/rs/compose.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
rs00:
3-
image: mongo:8
3+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
44
container_name: rs00
55
hostname: rs00
66
ports: ["30000:30000"]
@@ -19,7 +19,7 @@ services:
1919
]
2020

2121
rs01:
22-
image: mongo:8
22+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
2323
container_name: rs01
2424
hostname: rs01
2525
ports: ["30001:30001"]
@@ -38,7 +38,7 @@ services:
3838
]
3939

4040
rs02:
41-
image: mongo:8
41+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
4242
container_name: rs02
4343
hostname: rs02
4444
ports: ["30002:30002"]
@@ -57,7 +57,7 @@ services:
5757
]
5858

5959
rs10:
60-
image: mongo:8
60+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
6161
container_name: rs10
6262
hostname: rs10
6363
ports: ["30100:30100"]
@@ -76,7 +76,7 @@ services:
7676
]
7777

7878
rs11:
79-
image: mongo:8
79+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
8080
container_name: rs11
8181
hostname: rs11
8282
ports: ["30101:30101"]
@@ -95,7 +95,7 @@ services:
9595
]
9696

9797
rs12:
98-
image: mongo:8
98+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
9999
container_name: rs12
100100
hostname: rs12
101101
ports: ["30102:30102"]

‎hack/sh-ha/compose.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22

33
# ----------------- Source -----------------
44
src-mongos:
5-
image: percona/percona-server-mongodb:8.0
5+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
66
container_name: src-mongos
77
hostname: src-mongos
88
ports: ["27017:27017"]
@@ -17,7 +17,7 @@ services:
1717
]
1818

1919
src-cfg0:
20-
image: percona/percona-server-mongodb:8.0
20+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
2121
container_name: src-cfg0
2222
hostname: src-cfg0
2323
ports: ["27000:27000"]
@@ -33,7 +33,7 @@ services:
3333
"27000",
3434
]
3535
src-cfg1:
36-
image: percona/percona-server-mongodb:8.0
36+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
3737
container_name: src-cfg1
3838
hostname: src-cfg1
3939
ports: ["27001:27001"]
@@ -49,7 +49,7 @@ services:
4949
"27001",
5050
]
5151
src-cfg2:
52-
image: percona/percona-server-mongodb:8.0
52+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
5353
container_name: src-cfg2
5454
hostname: src-cfg2
5555
ports: ["27002:27002"]
@@ -66,7 +66,7 @@ services:
6666
]
6767

6868
src-rs00:
69-
image: percona/percona-server-mongodb:8.0
69+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
7070
container_name: src-rs00
7171
hostname: src-rs00
7272
ports: ["30000:30000"]
@@ -82,7 +82,7 @@ services:
8282
"30000",
8383
]
8484
src-rs01:
85-
image: percona/percona-server-mongodb:8.0
85+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
8686
container_name: src-rs01
8787
hostname: src-rs01
8888
ports: ["30001:30001"]
@@ -98,7 +98,7 @@ services:
9898
"30001",
9999
]
100100
src-rs02:
101-
image: percona/percona-server-mongodb:8.0
101+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
102102
container_name: src-rs02
103103
hostname: src-rs02
104104
ports: ["30002:30002"]
@@ -115,7 +115,7 @@ services:
115115
]
116116

117117
src-rs10:
118-
image: percona/percona-server-mongodb:8.0
118+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
119119
container_name: src-rs10
120120
hostname: src-rs10
121121
ports: ["30100:30100"]
@@ -131,7 +131,7 @@ services:
131131
"30100",
132132
]
133133
src-rs11:
134-
image: percona/percona-server-mongodb:8.0
134+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
135135
container_name: src-rs11
136136
hostname: src-rs11
137137
ports: ["30101:30101"]
@@ -147,7 +147,7 @@ services:
147147
"30101",
148148
]
149149
src-rs12:
150-
image: percona/percona-server-mongodb:8.0
150+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
151151
container_name: src-rs12
152152
hostname: src-rs12
153153
ports: ["30102:30102"]
@@ -165,7 +165,7 @@ services:
165165

166166
# ----------------- Target -----------------
167167
tgt-mongos:
168-
image: percona/percona-server-mongodb:8.0
168+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
169169
container_name: tgt-mongos
170170
hostname: tgt-mongos
171171
ports: ["29017:27017"]
@@ -180,7 +180,7 @@ services:
180180
]
181181

182182
tgt-cfg0:
183-
image: percona/percona-server-mongodb:8.0
183+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
184184
container_name: tgt-cfg0
185185
hostname: tgt-cfg0
186186
ports: ["28000:28000"]
@@ -196,7 +196,7 @@ services:
196196
"28000",
197197
]
198198
tgt-cfg1:
199-
image: percona/percona-server-mongodb:8.0
199+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
200200
container_name: tgt-cfg1
201201
hostname: tgt-cfg1
202202
ports: ["28001:28001"]
@@ -212,7 +212,7 @@ services:
212212
"28001",
213213
]
214214
tgt-cfg2:
215-
image: percona/percona-server-mongodb:8.0
215+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
216216
container_name: tgt-cfg2
217217
hostname: tgt-cfg2
218218
ports: ["28002:28002"]
@@ -229,7 +229,7 @@ services:
229229
]
230230

231231
tgt-rs00:
232-
image: percona/percona-server-mongodb:8.0
232+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
233233
container_name: tgt-rs00
234234
hostname: tgt-rs00
235235
ports: ["40000:40000"]
@@ -245,7 +245,7 @@ services:
245245
"40000",
246246
]
247247
tgt-rs01:
248-
image: percona/percona-server-mongodb:8.0
248+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
249249
container_name: tgt-rs01
250250
hostname: tgt-rs01
251251
ports: ["40001:40001"]
@@ -261,7 +261,7 @@ services:
261261
"40001",
262262
]
263263
tgt-rs02:
264-
image: percona/percona-server-mongodb:8.0
264+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
265265
container_name: tgt-rs02
266266
hostname: tgt-rs02
267267
ports: ["40002:40002"]
@@ -278,7 +278,7 @@ services:
278278
]
279279

280280
tgt-rs10:
281-
image: percona/percona-server-mongodb:8.0
281+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
282282
container_name: tgt-rs10
283283
hostname: tgt-rs10
284284
ports: ["40100:40100"]
@@ -294,7 +294,7 @@ services:
294294
"40100",
295295
]
296296
tgt-rs11:
297-
image: percona/percona-server-mongodb:8.0
297+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
298298
container_name: tgt-rs11
299299
hostname: tgt-rs11
300300
ports: ["40101:40101"]
@@ -310,7 +310,7 @@ services:
310310
"40101",
311311
]
312312
tgt-rs12:
313-
image: percona/percona-server-mongodb:8.0
313+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
314314
container_name: tgt-rs12
315315
hostname: tgt-rs12
316316
ports: ["40102:40102"]

‎hack/sh-ha/run.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SDIR="$BASE/sh-ha"
1111

1212
chmod 400 "$SDIR"/mongo/keyFile
1313

14-
export MONGO_IMAGE=mongo:8
1514
export compose=$SDIR/compose.yml
1615

1716
# dcf up -d src-cfg0 src-rs00 src-rs10 tgt-cfg0 tgt-rs00 tgt-rs10
@@ -39,7 +38,6 @@ msh "adm:pass@src-mongos:27017" --eval "
3938
sh.addShard('rs1/src-rs11:30101'); //
4039
sh.addShard('rs1/src-rs12:30102');
4140
"
42-
msh "adm:pass@src-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"
4341

4442
dcf up -d tgt-cfg0 tgt-cfg1 tgt-cfg2 tgt-rs00 tgt-rs01 tgt-rs02 tgt-rs10 tgt-rs11 tgt-rs12
4543

@@ -65,4 +63,3 @@ msh "adm:pass@tgt-mongos:27017" --eval "
6563
sh.addShard('rs1/tgt-rs11:40101'); //
6664
sh.addShard('rs1/tgt-rs12:40102');
6765
"
68-
msh "adm:pass@tgt-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"

0 commit comments

Comments
 (0)