Skip to content

Commit 6fec171

Browse files
inelpandzicinelpandzic
authored
PCSM-220: Missing shard key fields from the filter (#154)
1 parent 59e76d9 commit 6fec171

File tree

10 files changed

+162
-69
lines changed

10 files changed

+162
-69
lines changed

‎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');"

‎hack/sh/compose.yml‎

Lines changed: 8 additions & 8 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"]
@@ -34,7 +34,7 @@ services:
3434
]
3535

3636
src-rs00:
37-
image: percona/percona-server-mongodb:8.0
37+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
3838
container_name: src-rs00
3939
hostname: src-rs00
4040
ports: ["30000:30000"]
@@ -51,7 +51,7 @@ services:
5151
]
5252

5353
src-rs10:
54-
image: percona/percona-server-mongodb:8.0
54+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
5555
container_name: src-rs10
5656
hostname: src-rs10
5757
ports: ["30100:30100"]
@@ -69,7 +69,7 @@ services:
6969

7070
# ----------------- Target -----------------
7171
tgt-mongos:
72-
image: percona/percona-server-mongodb:8.0
72+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
7373
container_name: tgt-mongos
7474
hostname: tgt-mongos
7575
ports: ["29017:27017"]
@@ -84,7 +84,7 @@ services:
8484
]
8585

8686
tgt-cfg0:
87-
image: percona/percona-server-mongodb:8.0
87+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
8888
container_name: tgt-cfg0
8989
hostname: tgt-cfg0
9090
ports: ["28000:28000"]
@@ -101,7 +101,7 @@ services:
101101
]
102102

103103
tgt-rs00:
104-
image: percona/percona-server-mongodb:8.0
104+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
105105
container_name: tgt-rs00
106106
hostname: tgt-rs00
107107
ports: ["40000:40000"]
@@ -118,7 +118,7 @@ services:
118118
]
119119

120120
tgt-rs10:
121-
image: percona/percona-server-mongodb:8.0
121+
image: "${MONGO_IMAGE:-percona/percona-server-mongodb:8.0}"
122122
container_name: tgt-rs10
123123
hostname: tgt-rs10
124124
ports: ["40100:40100"]

‎hack/sh/run.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SDIR="$BASE/sh"
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
@@ -26,7 +25,7 @@ msh "adm:pass@src-mongos:27017" --eval "
2625
sh.addShard('rs0/src-rs00:30000'); //
2726
sh.addShard('rs1/src-rs10:30100');
2827
"
29-
msh "adm:pass@src-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"
28+
# msh "adm:pass@src-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"
3029

3130
dcf up -d tgt-cfg0 tgt-rs00 tgt-rs10
3231

@@ -39,4 +38,4 @@ msh "adm:pass@tgt-mongos:27017" --eval "
3938
sh.addShard('rs0/tgt-rs00:40000'); //
4039
sh.addShard('rs1/tgt-rs10:40100');
4140
"
42-
msh "adm:pass@tgt-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"
41+
# msh "adm:pass@tgt-mongos:27017" --eval "db.adminCommand('transitionFromDedicatedConfigServer');"

0 commit comments

Comments
 (0)