K8SPSMDB-1065: Fix checking oplog slicing locks (#1511)

* K8SPSMDB-1065: Fix checking oplog slicing locks

* fix pitr test

* fix `get_latest_restorable_time`

---------

Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
Co-authored-by: Andrii Dema <a.dema@jazzserve.com>

Author: 3 people

e2e-tests/functions

@@ -1460,11 +1460,10 @@ get_latest_restorable_time() {
 	# "pbm-agent status" can return different timestamp in first few seconds
 	# we need to get it twice to be sure that timestamp was not changed
 	until [[ $first_timestamp != "" && $first_timestamp != "null" && $first_timestamp == $second_timestamp ]]; do
+		first_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
 		sleep 5
 		if [[ $first_timestamp != "" && $first_timestamp != "null" ]]; then
 			second_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
-		else
-			first_timestamp=$(kubectl_bin exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
 		fi
 		let retry+=1
 		if [[ $retry -gt 30 ]]; then

e2e-tests/pitr/run

@@ -93,30 +93,6 @@ check_recovery() {
 	compare_mongo_cmd "find" "myApp:myPass@$cluster-2.$cluster.$namespace" "$cmp_postfix"
 }
 
-get_latest_restorable_time() {
-	local cluster=$1
-	local timestamp
-
-	timestamp=$(kubectl exec "$cluster-0" -c backup-agent -- pbm status -o json | jq '.backups.pitrChunks.pitrChunks | last | .range.end')
-
-	$date -u -d @"$timestamp" "+%Y-%m-%dT%H:%M:%SZ"
-}
-
-compare_latest_restorable_time() {
-	local cluster=$1
-	local backup_name=$2
-	local latest_restorable_time
-	latest_restorable_time=$(get_latest_restorable_time "$cluster")
-	local backup_time
-	backup_time=$(kubectl get psmdb-backup "$backup_name" -o jsonpath='{.status.latestRestorableTime}')
-
-	if [[ $latest_restorable_time != "$backup_time" ]]; then
-		echo "Error: latestRestorableTime is not equal to the latest timestamp of the backup $backup_name: $latest_restorable_time != $backup_time"
-		exit 1
-	fi
-
-}
-
 main() {
 	create_infra $namespace
 	deploy_minio

pkg/psmdb/backup/pbm.go

@@ -389,9 +389,16 @@ func NotJobLock(j Job) LockHeaderPredicate {
 func (b *pbmC) HasLocks(ctx context.Context, predicates ...LockHeaderPredicate) (bool, error) {
 	locks, err := lock.GetLocks(ctx, b.Client, &lock.LockHeader{})
 	if err != nil {
-		return false, errors.Wrap(err, "getting lock data")
+		return false, errors.Wrap(err, "get lock data")
 	}
 
+	opLocks, err := lock.GetOpLocks(ctx, b.Client, &lock.LockHeader{})
+	if err != nil {
+		return false, errors.Wrap(err, "get op lock data")
+	}
+
+	locks = append(locks, opLocks...)
+
 	allowedByAllPredicates := func(l lock.LockHeader) bool {
 		for _, allow := range predicates {
 			if !allow(l) {