Merge branch 'main' into K8SPSMDB-1211

Author: hors

build/physical-restore-ps-entry.sh

@@ -1,15 +1,36 @@
 #!/bin/bash
 
-set -Eeuo pipefail
+set -e
 set -o xtrace
 
-log=/tmp/pbm-agent.log
+PBM_AGENT_LOG=/tmp/pbm-agent.log
+MONGOD_LOG=/tmp/mongod.log
+PHYSICAL_RESTORE_DIR=/data/db/pbm-restore-logs
+
+function handle_sigterm() {
+	echo "Received SIGTERM, cleaning up..."
+
+	mkdir ${PHYSICAL_RESTORE_DIR}
+	mv pbm.restore.log.* ${PBM_AGENT_LOG} ${MONGOD_LOG} ${PHYSICAL_RESTORE_DIR}/
+
+	echo "Restore finished, you can find logs in ${PHYSICAL_RESTORE_DIR}"
+	exit 0
+}
+
+trap 'handle_sigterm' 15
 
 touch /opt/percona/restore-in-progress
 
-/opt/percona/pbm-agent 1>&2 2>${log} &
-/opt/percona/ps-entry.sh "$@" 1>&2 2>/tmp/mongod.log
+/opt/percona/pbm-agent >${PBM_AGENT_LOG} 2>&1 &
+pbm_pid=$!
+
+/opt/percona/ps-entry.sh "$@" >${MONGOD_LOG} 2>&1 &
+mongod_pid=$!
 
-echo "Physical restore in progress"
-tail -n +1 -f ${log}
-sleep infinity
+set +o xtrace
+echo "Physical restore in progress... pbm-agent logs: ${PBM_AGENT_LOG} mongod logs: ${MONGOD_LOG}"
+echo "Script PID: $$, pbm-agent PID: $pbm_pid, mongod PID: $mongod_pid"
+while true; do
+    echo "Still in progress at $(date)"
+    sleep 10
+done

cmd/manager/main.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	"github.com/percona/percona-server-mongodb-operator/pkg/apis"
+	psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
 	"github.com/percona/percona-server-mongodb-operator/pkg/controller"
 	"github.com/percona/percona-server-mongodb-operator/pkg/k8s"
 	"github.com/percona/percona-server-mongodb-operator/pkg/mcs"
@@ -103,6 +104,23 @@ func main() {
 		}),
 	}
 
+	options.Controller.GroupKindConcurrency = map[string]int{
+		"PerconaServerMongoDB." + psmdbv1.SchemeGroupVersion.Group:        1,
+		"PerconaServerMongoDBBackup." + psmdbv1.SchemeGroupVersion.Group:  1,
+		"PerconaServerMongoDBRestore." + psmdbv1.SchemeGroupVersion.Group: 1,
+	}
+
+	if s := os.Getenv("MAX_CONCURRENT_RECONCILES"); s != "" {
+		if i, err := strconv.Atoi(s); err == nil && i > 0 {
+			options.Controller.GroupKindConcurrency["PerconaServerMongoDB."+psmdbv1.SchemeGroupVersion.Group] = i
+			options.Controller.GroupKindConcurrency["PerconaServerMongoDBBackup."+psmdbv1.SchemeGroupVersion.Group] = i
+			options.Controller.GroupKindConcurrency["PerconaServerMongoDBRestore."+psmdbv1.SchemeGroupVersion.Group] = i
+		} else {
+			setupLog.Error(err, "MAX_CONCURRENT_RECONCILES must be a positive number")
+			os.Exit(1)
+		}
+	}
+
 	// Add support for MultiNamespace set in WATCH_NAMESPACE
 	if len(namespace) > 0 {
 		namespaces := make(map[string]cache.Config)

config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml

@@ -67,8 +67,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

deploy/bundle.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:
@@ -19844,3 +19842,5 @@ spec:
               value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
+            - name: MAX_CONCURRENT_RECONCILES
+              value: "1"

deploy/crd.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:

deploy/cw-bundle.yaml

@@ -71,8 +71,6 @@ spec:
                 type: integer
               compressionType:
                 type: string
-              psmdbCluster:
-                type: string
               storageName:
                 type: string
               type:
@@ -19863,3 +19861,5 @@ spec:
               value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
+            - name: MAX_CONCURRENT_RECONCILES
+              value: "1"

deploy/cw-operator.yaml

@@ -46,3 +46,5 @@ spec:
               value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
+            - name: MAX_CONCURRENT_RECONCILES
+              value: "1"

deploy/operator.yaml

@@ -48,3 +48,5 @@ spec:
               value: 5s
             - name: DISABLE_TELEMETRY
               value: "false"
+            - name: MAX_CONCURRENT_RECONCILES
+              value: "1"

e2e-tests/custom-replset-name/conf/backup-minio.yml

@@ -3,5 +3,5 @@ kind: PerconaServerMongoDBBackup
 metadata:
   name: backup-minio
 spec:
-  psmdbCluster: some-name
+  clusterName: some-name
   storageName: minio

e2e-tests/functions

@@ -343,6 +343,36 @@ simple_data_check() {
 	fi
 }
 
+get_mongod_pods() {
+	local cluster=$1
+
+	kubectl_bin get pod \
+		--no-headers \
+		-l app.kubernetes.io/instance=${cluster} \
+		-l app.kubernetes.io/component=mongod
+
+}
+
+collect_physical_restore_logs() {
+	local cluster=$1
+	local restore=$2
+
+	for pod in $(get_mongod_pods ${cluster}); do
+		desc "pbm-agent logs from ${pod}"
+		kubectl_bin exec -it ${pod} -- cat /tmp/pbm-agent.log || true
+	done
+}
+
+is_physical_backup() {
+	local backup=$1
+
+	if [[ $(kubectl_bin get psmdb-backup ${backup} -o jsonpath={.status.type}) == "physical" ]]; then
+		return 0
+	fi
+
+	return 1
+}
+
 wait_restore() {
 	local backup_name=$1
 	local cluster_name=$2
@@ -384,6 +414,11 @@ wait_restore() {
 				| grep -v 'Getting tasks for pod' \
 				| grep -v 'Getting pods from source' \
 				| tail -100
+
+			if is_physical_backup ${backup_name}; then
+				collect_physical_restore_logs
+			fi
+
 			kubectl_bin get psmdb-restore restore-${backup_name} -o yaml
 			kubectl_bin describe psmdb-restore restore-${backup_name}
 			echo "Restore object restore-${backup_name} is in ${current_state} state."