remove wait and fix tests

Author: pooknull

e2e-tests/demand-backup-incremental-sharded/run

@@ -50,9 +50,7 @@ run_recovery_check() {
 	# we don't wait for cluster readiness here because the annotation gets removed then
 	wait_restore "${backup_name}" "${cluster}" "ready" "0" "3000"
 
-	sleep 15
-
-	if [ $(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"') == null ]; then
+	if [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"')" == null ] && [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-in-progress"')" == null ]; then
 		log "psmdb/${cluster} should be annotated with percona.com/resync-pbm after a incremental restore"
 		exit 1
 	fi

e2e-tests/demand-backup-incremental/run

@@ -50,9 +50,7 @@ run_recovery_check() {
 	# we don't wait for cluster readiness here because the annotation gets removed then
 	wait_restore "${backup_name}" "${cluster}" "ready" "0" "1800"
 
-	sleep 15
-
-	if [ $(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"') == null ]; then
+	if [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"')" == null ] && [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-in-progress"')" == null ]; then
 		log "psmdb/${cluster} should be annotated with percona.com/resync-pbm after a incremental restore"
 		exit 1
 	fi

e2e-tests/demand-backup-physical-sharded/run

@@ -37,9 +37,7 @@ run_recovery_check() {
 	# we don't wait for cluster readiness here because the annotation gets removed then
 	wait_restore "${backup_name}" "${cluster}" "ready" "0" "3000"
 
-	sleep 15
-
-	if [ $(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"') == null ]; then
+	if [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"')" == null ] && [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-in-progress"')" == null ]; then
 		echo "psmdb/${cluster} should be annotated with percona.com/resync-pbm after a physical restore"
 		exit 1
 	fi

e2e-tests/demand-backup-physical/run

@@ -37,9 +37,7 @@ run_recovery_check() {
 	# we don't wait for cluster readiness here because the annotation gets removed then
 	wait_restore "${backup_name}" "${cluster}" "ready" "0" "1800"
 
-	sleep 15
-
-	if [ $(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"') == null ]; then
+	if [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-pbm"')" == null ] && [ "$(kubectl_bin get psmdb ${cluster} -o yaml | yq '.metadata.annotations."percona.com/resync-in-progress"')" == null ]; then
 		echo "psmdb/${cluster} should be annotated with percona.com/resync-pbm after a physical restore"
 		exit 1
 	fi

pkg/controller/perconaservermongodbrestore/physical.go

@@ -420,28 +420,6 @@ func (r *ReconcilePerconaServerMongoDBRestore) finishPhysicalRestore(ctx context
 		return false, errors.Wrapf(err, "annotate psmdb/%s for PBM resync", cluster.Name)
 	}
 
-	err = retry.OnError(retry.DefaultBackoff, func(err error) bool {
-		return err != nil
-	}, func() error {
-		c := new(psmdbv1.PerconaServerMongoDB)
-		if err := r.client.Get(ctx, client.ObjectKeyFromObject(cluster), c); err != nil {
-			return err
-		}
-
-		if c.Annotations == nil {
-			return errors.New("annotation wasn't added")
-		}
-
-		if v, ok := c.Annotations[psmdbv1.AnnotationResyncPBM]; !ok || v != "true" {
-			return errors.New("annotation wasn't added 2")
-		}
-
-		return nil
-	})
-	if err != nil {
-		return false, errors.Wrap(err, "failed to check if annotation was added")
-	}
-
 	if err := r.updateMongodSts(ctx, cluster, func(sts *appsv1.StatefulSet) error {
 		if sts.Annotations[psmdbv1.AnnotationRestoreInProgress] == "true" {
 			delete(sts.Annotations, psmdbv1.AnnotationRestoreInProgress)