From b63d7e011b667a19fd917ccf61700e9cd6903e90 Mon Sep 17 00:00:00 2001
From: BillAnastasiadis <54620830+BillAnastasiadis@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:17:46 +0300
Subject: [PATCH] Replace sleep with system-up checks (#19673)

---
 lib/sles4sap_publiccloud.pm  | 35 ++++++++++++++++++++++++++++++++++-
 t/12_sles4sap_publicccloud.t |  1 +
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/sles4sap_publiccloud.pm b/lib/sles4sap_publiccloud.pm
index d2b83393292d..1d51ddd3259a 100644
--- a/lib/sles4sap_publiccloud.pm
+++ b/lib/sles4sap_publiccloud.pm
@@ -14,6 +14,7 @@ package sles4sap_publiccloud;
 
 use base 'publiccloud::basetest';
 use strict;
+use JSON;
 use warnings FATAL => 'all';
 use Exporter 'import';
 use Scalar::Util 'looks_like_number';
@@ -299,6 +300,37 @@ sub is_hana_resource_running {
     }
 }
 
+=head2 is_hana_node_up
+    is_hana_node_up($my_instance, [timeout => 900]);
+
+    Waits until 'is_system_running' returns successfully on the target instance.
+
+=over 2
+
+=item B<instance> - the instance the test needs to wait for
+
+=item B<timeout> - how much time to wait for before aborting
+
+=back  
+=cut
+
+sub wait_hana_node_up {
+    my ($instance, %args) = @_;
+    $args{timeout} //= 900;
+    my $start_time = time();
+    my $out;
+    while ((time() - $start_time) < $args{timeout}) {
+        $out = $instance->run_ssh_command(
+            cmd => "sudo systemctl is-system-running",
+            timeout => 5,
+            proceed_on_failure => 1);
+        return if ($out =~ m/running/);
+        record_info("WAIT_FOR_SYSTEM", "System state: $out");
+        sleep 10;
+    }
+    die "Timeout reached. is_system_running returns \"$out\"";
+}
+
 =head2 stop_hana
     stop_hana([timeout => $timeout, method => $method]);
 
@@ -346,7 +378,8 @@ sub stop_hana {
         record_info("Wait ssh disappear start");
         my $out = $self->{my_instance}->wait_for_ssh(timeout => 60, wait_stop => 1);
         record_info("Wait ssh disappear end", "out:" . ($out // 'undefined'));
-        sleep 10;
+        # wait for node to be ready
+        wait_hana_node_up($self->{my_instance}, timeout => 900);
         $out = $self->{my_instance}->wait_for_ssh(timeout => 900);
         record_info("Wait ssh is back again", "out:" . ($out // 'undefined'));
     }
diff --git a/t/12_sles4sap_publicccloud.t b/t/12_sles4sap_publicccloud.t
index 604cd973c5e5..fe105b9057de 100644
--- a/t/12_sles4sap_publicccloud.t
+++ b/t/12_sles4sap_publicccloud.t
@@ -162,6 +162,7 @@ subtest "[stop_hana] crash" => sub {
     my $sles4sap_publiccloud = Test::MockModule->new('sles4sap_publiccloud', no_auto => 1);
     $sles4sap_publiccloud->redefine(record_info => sub { note(join(' ', 'RECORD_INFO -->', @_)); });
     $sles4sap_publiccloud->redefine(wait_for_sync => sub { return; });
+    $sles4sap_publiccloud->redefine(wait_hana_node_up => sub { return; });
 
     my $self = sles4sap_publiccloud->new();
     my $mock_pc = Test::MockObject->new();