Release 2.12.0

.github/workflows/ci.yml

@@ -41,8 +41,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        psmdb: ["6.0", "7.0", "8.0"]
-        test: [logical, physical, incremental, external]
+        psmdb: ["7.0", "8.0"]
+        shard: [0, 1, 2, 3, 4, 5, 6]
     env:
       PBM_BRANCH: ${{ github.event.inputs.pbm_branch || github.ref_name }}
       GO_VER: ${{ github.event.inputs.go_ver || '1.25-bookworm' }}
@@ -63,9 +63,9 @@ jobs:
           docker compose up -d
         working-directory: psmdb-testing/pbm-functional/pytest
 
-      - 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 }}
+      - 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 }}
         run: |
-          docker compose run test pytest -s --junitxml=junit.xml -k ${{ matrix.test }}
+          docker compose run test pytest -s --junitxml=junit.xml --shard-id=${{ matrix.shard }} --num-shards=7 -m 'not jenkins and not skip'
         working-directory: psmdb-testing/pbm-functional/pytest
 
       - name: Fetch coverage files
@@ -78,7 +78,7 @@ jobs:
       - name: Upload coverage reports
         uses: actions/upload-artifact@v4
         with:
-          name: reports-${{ matrix.test }}-${{ matrix.psmdb }}
+          name: reports-${{ matrix.shard }}-${{ matrix.psmdb }}
           path: psmdb-testing/pbm-functional/pytest/reports/
         if: success() || failure()
 

CONTRIBUTING.md

@@ -101,15 +101,15 @@ You can find the tests in the ``e2e-tests`` directory.
 To save time on tests execution during development, we recommend running  general and consistency tests for a sharded cluster:
 
 ```sh
-$ MONGODB_VERSION=5.0 ./run-sharded
+$ MONGODB_VERSION=8.0 ./run-sharded
 ```
 
-``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 5.0.
+``$ MONGODB_VERSION`` stands for the Percona Server for MongoDB version Percona Backup for MongoDB is running with. Default is 8.0.
 
 After the development is complete and you are ready to submit a pull request, run all tests using the following command:
 
 ```sh
-$ MONGODB_VERSION=5.0 ./run-all
+$ MONGODB_VERSION=8.0 ./run-all
 ```
 
 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

@@ -6,7 +6,7 @@ CGO_ENABLED?=0
 GITCOMMIT?=$(shell git rev-parse HEAD 2>/dev/null)
 GITBRANCH?=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
 BUILDTIME?=$(shell TZ=UTC date "+%Y-%m-%d_%H:%M_UTC")
-MONGO_TEST_VERSION?=5.0
+MONGO_TEST_VERSION?=8.0
 
 define ENVS
 	GO111MODULE=$(GOMOD) \

cmd/pbm/status.go

@@ -131,7 +131,7 @@
 	}
 
 	var sfilter map[string]bool
 	if opts.sections != nil && len(opts.sections) > 0 {
 		sfilter = make(map[string]bool)
 		for _, s := range opts.sections {
 			sfilter[s] = true
@@ -540,10 +540,7 @@
 	}
 
 	s.Type = cfg.Storage.Typ()
-
-	if cfg.Storage.Type == storage.S3 {
-		s.Region = cfg.Storage.S3.Region
-	}
+	s.Region = cfg.Storage.Region()
 	s.Path = cfg.Storage.Path()
 
 	bcps, err := pbm.GetAllBackups(ctx)

e2e-tests/README.md

@@ -3,9 +3,9 @@
 ## Run tests
 Run all tests
 ```
-$ MONGODB_VERSION=6.0 ./run-all
+$ MONGODB_VERSION=8.0 ./run-all
 ```
-`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
+`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `8.0`
 
 `./run-all` would run all tests both on a sharded cluster and a non-sharded replica set.
 
@@ -20,9 +20,9 @@ $ MONGODB_VERSION=6.0 ./run-all
 ## Start test cluster
 To start tests with a running pbm-agent and minio storage:
 ```
-$ MONGODB_VERSION=6.0 ./start-cluster
+$ MONGODB_VERSION=8.0 ./start-cluster
 ```
-`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `6.0`
+`MONGODB_VERSION` is a PSMDB version (e.g. 6.0/7.0/8.0). Default is `8.0`
 
 `./start-replset` - to start a non-sharded replica set.
 

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

@@ -27,7 +27,9 @@ func run(t *sharded.Cluster, typ testTyp) {
 		{"AWS", "/etc/pbm/aws.yaml"},
 		{"GCS", "/etc/pbm/gcs.yaml"},
 		{"GCS_HMAC", "/etc/pbm/gcs_hmac.yaml"},
+		{"AWS_MinIO", "/etc/pbm/aws_minio.yaml"},
 		{"Azure", "/etc/pbm/azure.yaml"},
+		{"OSS", "/etc/pbm/oss.yaml"},
 		{"FS", "/etc/pbm/fs.yaml"},
 	}
 

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

@@ -18,7 +18,9 @@ func runPhysical(t *sharded.Cluster, typ testTyp) {
 		{"AWS", "/etc/pbm/aws.yaml"},
 		{"GCS", "/etc/pbm/gcs.yaml"},
 		{"GCS_HMAC", "/etc/pbm/gcs_hmac.yaml"},
+		{"AWS_MinIO", "/etc/pbm/aws_minio.yaml"},
 		{"Azure", "/etc/pbm/azure.yaml"},
+		{"OSS", "/etc/pbm/oss.yaml"},
 		{"FS", "/etc/pbm/fs.yaml"},
 	}
 

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

@@ -24,7 +24,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs101
     labels:
@@ -54,7 +54,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     volumes:
       - ./conf:/etc/pbm
@@ -69,7 +69,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs201
     labels:
@@ -99,7 +99,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     volumes:
       - ./conf:/etc/pbm

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

@@ -28,7 +28,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     volumes:
       - ./conf:/etc/pbm
@@ -41,7 +41,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs101
     labels:
@@ -51,7 +51,7 @@ services:
       - MONGO_USER=dba
       - BACKUP_USER=bcp
       - MONGO_PASS=test1234
-      - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+      - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
     command: mongod --replSet rs1 --directoryperdb --port 27017 --dbpath=/data/db/ --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
     volumes:
       - data-rs101:/data/db
@@ -61,7 +61,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs102
     labels:
@@ -74,7 +74,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs103
     labels:
@@ -98,7 +98,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     volumes:
       - ./conf:/etc/pbm
@@ -123,7 +123,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     command: pbm-agent
     cap_add:
@@ -147,7 +147,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     command: pbm-agent
     cap_add:

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

@@ -24,7 +24,7 @@ services:
       dockerfile: ./e2e-tests/docker/mongodb.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     hostname: rs101
     labels:
@@ -35,7 +35,7 @@ services:
       - BACKUP_USER=bcp
       - MONGO_PASS=test1234
       - SINGLE_NODE=true
-      - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+      - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
     command: mongod --replSet rs1 --port 27017 --storageEngine wiredTiger --keyFile /opt/keyFile --wiredTigerCacheSizeGB 1
     volumes:
       - data-rs101:/data/db
@@ -55,7 +55,7 @@ services:
       dockerfile: ./e2e-tests/docker/pbm.dockerfile
       context: ../..
       args:
-        - MONGODB_VERSION=${MONGODB_VERSION:-6.0}
+        - MONGODB_VERSION=${MONGODB_VERSION:-8.0}
         - MONGODB_IMAGE=${MONGODB_IMAGE:-perconalab/percona-server-mongodb}
     volumes:
       - ./conf:/etc/pbm