Skip to content

Commit 05ab6d7

Browse files
sandraromanchenkosandraromanchenko
authored
Merge pull request #1222 from percona/release-2.12.0
Release 2.12.0
2 parents 2f499a6 + 2f7100a commit 05ab6d7

File tree

471 files changed

+55882
-7178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

471 files changed

+55882
-7178
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
psmdb: ["6.0", "7.0", "8.0"]
45-
test: [logical, physical, incremental, external]
44+
psmdb: ["7.0", "8.0"]
45+
shard: [0, 1, 2, 3, 4, 5, 6]
4646
env:
4747
PBM_BRANCH: ${{ github.event.inputs.pbm_branch || github.ref_name }}
4848
GO_VER: ${{ github.event.inputs.go_ver || '1.25-bookworm' }}
@@ -63,9 +63,9 @@ jobs:
6363
docker compose up -d
6464
working-directory: psmdb-testing/pbm-functional/pytest
6565

66-
- name: Test ${{ matrix.test }} backup/restore on PSMDB ${{ matrix.psmdb }} for PBM PR/branch ${{ github.event.pull_request.title || env.PR_NUMBER || env.PBM_BRANCH }}
66+
- name: Run pytest shard number ${{ matrix.shard }} on PSMDB ${{ matrix.psmdb }} for PBM PR/branch ${{ github.event.pull_request.title || env.PR_NUMBER || env.PBM_BRANCH }}
6767
run: |
68-
docker compose run test pytest -s --junitxml=junit.xml -k ${{ matrix.test }}
68+
docker compose run test pytest -s --junitxml=junit.xml --shard-id=${{ matrix.shard }} --num-shards=7 -m 'not jenkins and not skip'
6969
working-directory: psmdb-testing/pbm-functional/pytest
7070

7171
- name: Fetch coverage files
@@ -78,7 +78,7 @@ jobs:
7878
- name: Upload coverage reports
7979
uses: actions/upload-artifact@v4
8080
with:
81-
name: reports-${{ matrix.test }}-${{ matrix.psmdb }}
81+
name: reports-${{ matrix.shard }}-${{ matrix.psmdb }}
8282
path: psmdb-testing/pbm-functional/pytest/reports/
8383
if: success() || failure()
8484

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ You can find the tests in the ``e2e-tests`` directory.
101101
To save time on tests execution during development, we recommend running general and consistency tests for a sharded cluster:
102102

103103
```sh
104-
$ MONGODB_VERSION=5.0 ./run-sharded
104+
$ MONGODB_VERSION=8.0 ./run-sharded
105105
```
106106

107-
``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 5.0.
107+
``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 8.0.
108108

109109
After the development is complete and you are ready to submit a pull request, run all tests using the following command:
110110

111111
```sh
112-
$ MONGODB_VERSION=5.0 ./run-all
112+
$ MONGODB_VERSION=8.0 ./run-all
113113
```
114114

115115
You can run tests on your local machine with whatever operating system you have. After you submit the pull request, we will check your patch on multiple operating systems.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CGO_ENABLED?=0
66
GITCOMMIT?=$(shell git rev-parse HEAD 2>/dev/null)
77
GITBRANCH?=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
88
BUILDTIME?=$(shell TZ=UTC date "+%Y-%m-%d_%H:%M_UTC")
9-
MONGO_TEST_VERSION?=5.0
9+
MONGO_TEST_VERSION?=8.0
1010

1111
define ENVS
1212
GO111MODULE=$(GOMOD) \

‎cmd/pbm/status.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,10 +540,7 @@ func getStorageStat(
540540
}
541541

542542
s.Type = cfg.Storage.Typ()
543-
544-
if cfg.Storage.Type == storage.S3 {
545-
s.Region = cfg.Storage.S3.Region
546-
}
543+
s.Region = cfg.Storage.Region()
547544
s.Path = cfg.Storage.Path()
548545

549546
bcps, err := pbm.GetAllBackups(ctx)

‎e2e-tests/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
## Run tests
44
Run all tests
55
```
6-
$ MONGODB_VERSION=6.0 ./run-all
6+
$ MONGODB_VERSION=8.0 ./run-all
77
```
8-
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
8+
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `8.0`
99

1010
`./run-all` would run all tests both on a sharded cluster and a non-sharded replica set.
1111

@@ -20,9 +20,9 @@ $ MONGODB_VERSION=6.0 ./run-all
2020
## Start test cluster
2121
To start tests with a running pbm-agent and minio storage:
2222
```
23-
$ MONGODB_VERSION=6.0 ./start-cluster
23+
$ MONGODB_VERSION=8.0 ./start-cluster
2424
```
25-
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
25+
`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `8.0`
2626

2727
`./start-replset` - to start a non-sharded replica set.
2828

‎e2e-tests/cmd/pbm-test/run.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ func run(t *sharded.Cluster, typ testTyp) {
2727
{"AWS", "/etc/pbm/aws.yaml"},
2828
{"GCS", "/etc/pbm/gcs.yaml"},
2929
{"GCS_HMAC", "/etc/pbm/gcs_hmac.yaml"},
30+
{"AWS_MinIO", "/etc/pbm/aws_minio.yaml"},
3031
{"Azure", "/etc/pbm/azure.yaml"},
32+
{"OSS", "/etc/pbm/oss.yaml"},
3133
{"FS", "/etc/pbm/fs.yaml"},
3234
}
3335

‎e2e-tests/cmd/pbm-test/run_physical.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ func runPhysical(t *sharded.Cluster, typ testTyp) {
1818
{"AWS", "/etc/pbm/aws.yaml"},
1919
{"GCS", "/etc/pbm/gcs.yaml"},
2020
{"GCS_HMAC", "/etc/pbm/gcs_hmac.yaml"},
21+
{"AWS_MinIO", "/etc/pbm/aws_minio.yaml"},
2122
{"Azure", "/etc/pbm/azure.yaml"},
23+
{"OSS", "/etc/pbm/oss.yaml"},
2224
{"FS", "/etc/pbm/fs.yaml"},
2325
}
2426

‎e2e-tests/docker/docker-compose-remapping.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
2525
context: ../..
2626
args:
27-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
27+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
2828
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
2929
hostname: rs101
3030
labels:
@@ -54,7 +54,7 @@ services:
5454
dockerfile: ./e2e-tests/docker/pbm.dockerfile
5555
context: ../..
5656
args:
57-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
57+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
5858
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
5959
volumes:
6060
- ./conf:/etc/pbm
@@ -69,7 +69,7 @@ services:
6969
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
7070
context: ../..
7171
args:
72-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
72+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
7373
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
7474
hostname: rs201
7575
labels:
@@ -99,7 +99,7 @@ services:
9999
dockerfile: ./e2e-tests/docker/pbm.dockerfile
100100
context: ../..
101101
args:
102-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
102+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
103103
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
104104
volumes:
105105
- ./conf:/etc/pbm

‎e2e-tests/docker/docker-compose-rs.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
dockerfile: ./e2e-tests/docker/pbm.dockerfile
2929
context: ../..
3030
args:
31-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
31+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
3232
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
3333
volumes:
3434
- ./conf:/etc/pbm
@@ -41,7 +41,7 @@ services:
4141
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
4242
context: ../..
4343
args:
44-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
44+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
4545
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
4646
hostname: rs101
4747
labels:
@@ -51,7 +51,7 @@ services:
5151
- MONGO_USER=dba
5252
- BACKUP_USER=bcp
5353
- MONGO_PASS=test1234
54-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
54+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
5555
command: mongod --replSet rs1 --directoryperdb --port 27017 --dbpath=/data/db/ --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
5656
volumes:
5757
- data-rs101:/data/db
@@ -61,7 +61,7 @@ services:
6161
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
6262
context: ../..
6363
args:
64-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
64+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
6565
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
6666
hostname: rs102
6767
labels:
@@ -74,7 +74,7 @@ services:
7474
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
7575
context: ../..
7676
args:
77-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
77+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
7878
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
7979
hostname: rs103
8080
labels:
@@ -98,7 +98,7 @@ services:
9898
dockerfile: ./e2e-tests/docker/pbm.dockerfile
9999
context: ../..
100100
args:
101-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
101+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
102102
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
103103
volumes:
104104
- ./conf:/etc/pbm
@@ -123,7 +123,7 @@ services:
123123
dockerfile: ./e2e-tests/docker/pbm.dockerfile
124124
context: ../..
125125
args:
126-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
126+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
127127
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
128128
command: pbm-agent
129129
cap_add:
@@ -147,7 +147,7 @@ services:
147147
dockerfile: ./e2e-tests/docker/pbm.dockerfile
148148
context: ../..
149149
args:
150-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
150+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
151151
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
152152
command: pbm-agent
153153
cap_add:

‎e2e-tests/docker/docker-compose-single.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
dockerfile: ./e2e-tests/docker/mongodb.dockerfile
2525
context: ../..
2626
args:
27-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
27+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
2828
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
2929
hostname: rs101
3030
labels:
@@ -35,7 +35,7 @@ services:
3535
- BACKUP_USER=bcp
3636
- MONGO_PASS=test1234
3737
- SINGLE_NODE=true
38-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
38+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
3939
command: mongod --replSet rs1 --port 27017 --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
4040
volumes:
4141
- data-rs101:/data/db
@@ -55,7 +55,7 @@ services:
5555
dockerfile: ./e2e-tests/docker/pbm.dockerfile
5656
context: ../..
5757
args:
58-
- MONGODB_VERSION=${MONGODB_VERSION:-6.0}
58+
- MONGODB_VERSION=${MONGODB_VERSION:-8.0}
5959
- MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
6060
volumes:
6161
- ./conf:/etc/pbm

0 commit comments

Comments
 (0)