From fdff305b999db3be78665f9b13fc014ee6fa4deb Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Mon, 28 Apr 2025 16:56:50 +0200 Subject: [PATCH] Add sleep before trying to cancel pending restore. We have encountered situations that indicates that the server responds: "There are no restartable restore sessions." But in the following command says: >>>>>> Restore Processing Interrupted!! <<<<<< ANS1330S This node currently has a pending restartable restore session. The requested operation cannot complete until this session either completes or is canceled. --- .../net/files/baas2_restoretest/run-failed-restore.expect | 1 + .../modules/net/files/baas2_restoretest/validate-backup-files | 3 +++ 2 files changed, 4 insertions(+) diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect index 0591b64..c1d9f2f 100644 --- a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect +++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/run-failed-restore.expect @@ -20,6 +20,7 @@ expect "Action \\\[1,2,3,A\\\] : " { "ANS8013I Invalid encryption key password" { set exit_val 0 expect "Action \\\[1,2,3,A\\\] : " + sleep 5 send -- "A\r" } eof { diff --git a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files index 2ad1c8a..ba97bde 100755 --- a/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files +++ b/global/overlay/etc/puppet/modules/net/files/baas2_restoretest/validate-backup-files @@ -42,6 +42,9 @@ exit_if_failed $? /opt/baas2/run-failed-restore.expect "$nodename" exit_if_failed $? +# Sleep to give backup server time to register an pending/open restore session +sleep 10 + # Run expect script that cancel any pending/open restores (which is an excpected result of the failed restore above) /opt/baas2/cancel-restore.expect "$nodename" exit_if_failed $?